README.md

@@ -1,40 +1,3 @@
 # awesome
-(SUNSETTED) this config is outdated and most of the themes/layouts will be ported to https://512mb.org/git/Yessiest/reno
 
 my slightly overcomplicated awesomewm config
-
-more content coming soon 
-
-# wow look at these screenshots
-(may or may not represent the real thing)
-
-![Carbon XFCE preset](https://512mb.org/git/Yessiest/awesome/raw/branch/master/screenshots/carbon-xfce-preset.png)
-
-![Unity-11.10 preset](https://512mb.org/git/Yessiest/awesome/raw/branch/master/screenshots/unity-11.10-preset.png)
-
-# how do i install this though
-you will need a compiler, make, lua headers that match your awesomewm's reported lua version (check with `awesome --version`) and pam headers.
-lua headers (for awesome compiled against lua 5.2) should be something like `lua52-devel` on void linux and such, can be installed on arch as `lua52`
-pam headers are either already installed or should be installed like `libpam-dev` or `pam-devel` or something like that
-
-1. run `various-scripts/install_luapam.sh`
-2. restart your DM and select awesome
-3. enjoy pls
-
-# License
-
-```
-Copyright (c) 2022 Yessiest
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```

core/binds/clientkeys.lua

@@ -42,11 +42,6 @@ local clientkeys = gears.table.join(
             c.maximized_horizontal = not c.maximized_horizontal
             c:raise()
         end ,
-        {description = "(un)maximize horizontally", group = "client"}),
+        {description = "(un)maximize horizontally", group = "client"})
-    awful.key({ global.modkey }, "v", 
-        function (c)
-            c.menu_button:emit_signal("button::press")
-        end, 
-        {description = "show client context menu", group = "client"})
 )
 return clientkeys

core/binds/globalbuttons.lua

@@ -2,7 +2,7 @@ local awful = require("awful")
 local gears = require("gears")
 
 return gears.table.join(
-    awful.button({ }, 3, function () menu:show() end),
+    awful.button({ }, 3, function () require("core.widgets.menu"):toggle() end),
     awful.button({ }, 4, awful.tag.viewnext),
     awful.button({ }, 5, awful.tag.viewprev)
 )

core/binds/globalkeys.lua

@@ -1,6 +1,5 @@
 local awful = require("awful")
 local gears = require("gears")
-local debug = require("libs.debug")
 
 local globalkeys = gears.table.join(
     awful.key({ global.modkey,           }, "Left",   awful.tag.viewprev,
@@ -77,21 +76,7 @@ local globalkeys = gears.table.join(
                     )
                   end
               end,
-              {description = "restore minimized", group = "client"}),
+              {description = "restore minimized", group = "client"})
-    awful.key({global.modkey,"Control" }, "s", function()
-        debug.print_awesome_memory_stats("Precollect")
-        collectgarbage("collect")
-        collectgarbage("collect")
-        gears.timer {
-            callback = function()
-                debug.print_awesome_memory_stats("Postcollect")
-                return false
-            end,
-            timeout = 5,
-            autostart = true,
-            single_shot = true
-        }
-    end, {description = "print awesome wm memory statistics", group="awesome"})
 )
 
 -- Bind all key numbers to tags.
@@ -142,7 +127,6 @@ for i = 1, 9 do
                   end,
                   {description = "toggle focused client on tag #" .. i, group = "tag"})
     )
-
 end
 
 return globalkeys

core/layout.lua

@@ -34,11 +34,13 @@ require("core.widgets.menubar")
 awful.screen.connect_for_each_screen(function(s)
     -- Wallpaper
     set_wallpaper(s)
+
     -- Each screen has its own tag table.
     awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
 
     -- Create a promptbox for each screen
     s.mypromptbox = require("core.widgets.prompt")()
+    require("widgets.stickers")(s)
     -- Create an imagebox widget which will contain an icon indicating which layout we're using.
     -- Create the taglist
     s.mytaglist = require("core.widgets.taglist")(s)
@@ -66,81 +68,59 @@ awful.screen.connect_for_each_screen(function(s)
         },
         bottom_widgets = {
             require("widgets.polylauncher")({vertical = true})
-        },
+        }
-        position="left"
     })
-    -- Menu
-    require("core.widgets.menu")
-    -- Start button
-    local start_button = wibox.widget {
-        {
-            {
-                image = beautiful.awesome_icon,
-                widget = wibox.widget.imagebox
-            },
-            widget = wibox.container.place,
-            halign = "center",
-            id = "menu"
-        },
-        bg = "#26262633",
-        widget = wibox.container.background,
-        forced_width = require("beautiful.xresources").apply_dpi(61),
-    }
-    start_button:connect_signal("button::press",function(self,x,y,button)
-        if button == 1 then
-            menu:show()
-        end
-    end)
     -- Add widgets to the wibox
     s.mywibox:setup {
-        expand = "outside",
         layout = wibox.layout.align.horizontal,
-        { 
+        { -- Left widgets
-            {
+            layout = wibox.layout.fixed.horizontal,
-                -- Left widgets
+            require("core.widgets.menu_launcher"),
-                start_button,
+            --require("widgets.polylauncher")({vertical = false}),
-                --require("widgets.polylauncher")({vertical = false}),
+            --s.mytaglist,
-                --s.mytaglist,
+            s.mypromptbox,
-                s.mypromptbox,
+            spacing = 3
-                layout = wibox.layout.fixed.horizontal,
-                spacing = 3
-            },
-            widget = wibox.container.place,
-            halign = "left",
-            fill_horizontal = false
         },
+        -- Middle widget
         {
-            layout = wibox.layout.fixed.horizontal
+            widget = wibox.container.background
         },
-        { 
+        { -- Right widgets
+            wibox.widget.textclock(),
             {
-                -- Right widgets
+                widget = wibox.container.background,
-                require("widgets.drawer")({
+                forced_width = (math.abs(s.geometry.width/2)-200)
-                    wibox.widget.systray(),
-                }),
-                require("widgets.wallpapers")({
-                    screen = s,
-                    path = os.getenv("HOME").."/Pictures/Wallpapers/",
-                }),
-                require("widgets.mailbox")({
-                    screen = s,
-                    style = {
-                        rounding = 1,
-                    }
-                }),
-                require("widgets.volume")({}),
-                require("widgets.battery")({
-                    percentage = true,
-                }),
-                awful.widget.keyboardlayout(),
-                wibox.widget.textclock(),
-                s.mylayoutbox,
-                layout = wibox.layout.fixed.horizontal,
-                spacing = 4,
             },
-            widget = wibox.container.place,
+            layout = wibox.layout.fixed.horizontal,
-            halign = "right",
+            awful.widget.keyboardlayout(),
-            fill_horizontal = false
+            require("widgets.wallpapers")({
+                screen = s,
+                path = os.getenv("HOME").."/Pictures/Wallpapers/",
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            require("widgets.mailbox")({
+                screen = s,
+                style = {
+                    rounding = 1,
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            --wibox.widget.systray(),
+            require("widgets.volume")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            require("widgets.battery")({
+                percentage = true,
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            s.mylayoutbox,
+            spacing = 4
         },
     }
 end)

core/signals.lua

@@ -7,11 +7,6 @@ client.connect_signal("manage", function (c)
     -- Set the windows at the slave,
     -- i.e. put it at the end of others instead of setting it master.
     -- if not awesome.startup then awful.client.setslave(c) end
-    -- Set fallback icon
-    if not c.icon then 
-        print(c.icon_name)
-        c.icon = beautiful.fallback_icon._native
-    end
 
     if awesome.startup
       and not c.size_hints.user_position

core/titlebar.lua

@@ -2,90 +2,47 @@ local awful = require("awful")
 local gears = require("gears")
 local wibox = require("wibox")
 local menu = require("widgets.polymenu")
--- To conserve memory we keep one menu at a time
+local move_screentags = {}
-if not menu_widget then
+local toggle_screentags = {}
-    local move_screentags = {}
+awful.screen.connect_for_each_screen(function(s)
-    local toggle_screentags = {}
+    local move_tags = {}
-    awful.screen.connect_for_each_screen(function(s)
+    local toggle_tags = {}
-        local move_tags = {}
+    for _,tag in pairs(s.tags) do
-        local toggle_tags = {}
+        table.insert(move_tags,{
-        for _,tag in pairs(s.tags) do
+            tag.name,
-            table.insert(move_tags,{
+            function()
-                tag.name,
+                if client.focus then
-                function()
+                    client.focus:tags({tag})
-                    if client.focus then
-                        client.focus:tags({tag})
-                    end
                 end
-            })
+            end
-            table.insert(toggle_tags,{
+        })
-                tag.name,
+        table.insert(toggle_tags,{
-                function()
+            tag.name,
-                    if client.focus then
+            function()
-                        local tags = client.focus:tags()
+                if client.focus then
-                        for k,v in pairs(tags) do
+                    local tags = client.focus:tags()
-                            if v == tag then
+                    for k,v in pairs(tags) do
-                                table.remove(tags,k)
+                        if v == tag then
-                                client.focus:tags(tags)
+                            table.remove(tags,k)
-                                return
+                            client.focus:tags(tags)
-                            end
+                            return
                         end
-                        table.insert(tags,tag)
-                        client.focus:tags(tags)
                     end
+                    table.insert(tags,tag)
+                    client.focus:tags(tags)
                 end
-            })
+            end
-        end
-        table.insert(move_screentags,{
-            "Screen "..tostring(s.index),
-            move_tags
         })
-        table.insert(toggle_screentags,{
+    end
-            "Screen "..tostring(s.index),
+    table.insert(move_screentags,{
-            toggle_tags
+        "Screen "..tostring(s.index),
-        })
+        move_tags
-    end)
-    controls_widget = wibox.widget {
-        forced_width = 72,
-        forced_height = 24,
-        layout = wibox.layout.fixed.horizontal,
-    }
-    menu_widget = menu({
-        before = {
-            controls_widget
-        },
-        after = {
-            require("widgets.client-volume")({})
-        },
-        items = {
-            { "Move to tag" , 
-                move_screentags
-            },
-            { "Toggle on tag",
-                toggle_screentags
-            },
-            { "Stop task",
-                function() 
-                    awful.spawn("kill "..tostring(c.pid))
-                end 
-            },
-            { "Kill task",
-                function() 
-                    awful.spawn("kill -s KILL "..tostring(c.pid))
-                end 
-            },
-            { "Debug info",
-                {
-                    before = {
-                        require("widgets.window-debug")()
-                    }
-                }
-            }
-        },
-        vertical = true
     })
-end
+    table.insert(toggle_screentags,{
-
+        "Screen "..tostring(s.index),
+        toggle_tags
+    })
+end)
 return function(c)
     local buttons = gears.table.join(
         awful.button({ }, 1, function()
@@ -97,61 +54,57 @@ return function(c)
             awful.mouse.client.resize(c)
         end)
     )
+    c.menu = menu({
+        before = {
+            {
+                awful.titlebar.widget.floatingbutton (c),
+                awful.titlebar.widget.stickybutton   (c),
+                awful.titlebar.widget.ontopbutton    (c),
+                forced_width = 72,
+                forced_height = 24,
+                layout = wibox.layout.fixed.horizontal,
+            }
+        },
+        items = {
+            { "Move to tag" , 
+                move_screentags
+            },
+            { "Toggle on tag",
+                toggle_screentags
+            }
+        },
+        vertical = true
+    })
     c.menu_button = awful.titlebar.widget.iconwidget(c)
-    -- A little trick we do to conserve memory and cpu usage on regenerating
-    -- buttons is we pop up a menu in the location of the icon
-    -- and insert buttons into the controls widget layout.
-    c.hidden_floatingbutton = awful.titlebar.widget.floatingbutton(c)
-    c.hidden_stickybutton = awful.titlebar.widget.stickybutton(c)
-    c.hidden_ontopbutton = awful.titlebar.widget.ontopbutton(c)
     c.menu_button:connect_signal("button::press", function()
-        menu_widget.toggle()
+        c.menu.toggle()
-        if controls_widget then
-            controls_widget:reset()
-            controls_widget:add(c.hidden_floatingbutton)
-            controls_widget:add(c.hidden_stickybutton)
-            controls_widget:add(c.hidden_ontopbutton)
-        end
         c:emit_signal("request::activate", "titlebar", {raise = true})
     end)
     c:connect_signal("unfocus",function()
-        if menu_widget.visible then
+        if c.menu.visible then
-            menu_widget.toggle(0,0)
+            c.menu.toggle(0,0)
         end
     end)
     return awful.titlebar(c) : setup {
         { -- Left 
             c.menu_button,
+            spacing = 10,
             layout  = wibox.layout.fixed.horizontal
         },
         { -- Middle
-            awful.titlebar.widget.titlewidget(c),
+            {
+                widget = awful.titlebar.widget.titlewidget(c),
+                align = "center"
+            },
             buttons = buttons,
             layout  = wibox.layout.flex.horizontal
         },
         { -- Right
-            {
+            awful.titlebar.widget.maximizedbutton(c),
-                {
+            awful.titlebar.widget.minimizebutton (c),
-                    awful.titlebar.widget.maximizedbutton(c),
+            awful.titlebar.widget.closebutton    (c),
-                    awful.titlebar.widget.minimizebutton (c),
+            layout = wibox.layout.fixed.horizontal(),
-                    awful.titlebar.widget.closebutton    (c),
-                    layout = wibox.layout.fixed.horizontal(),
-                    widget = wibox.container.margin,
-                    margins = 3            
-                },
-                widget = wibox.container.background,
-                shape = gears.shape.rounded_bar,
-                bg = {
-                    type = "linear",
-                    from = { 0, 15 },
-                    to = { 0, 0},
-                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
-                },
-            },
-            widget = wibox.container.margin,
-            margins = 2
         },
-        spacing = 10,
         layout = wibox.layout.align.horizontal,
     }
 end

core/vars.lua

@@ -5,7 +5,7 @@ global = {}
 global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
 global.config_dir = os.getenv("HOME").."/.awesome/"
 global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/unity/theme.lua"
+global.theme = global.awesome_dir .. "themes/unity2/theme.lua"
 global.terminal = "xterm"
 global.editor = os.getenv("EDITOR") or "vim"
 global.editor_cmd = global.terminal .. " -e ".. global.editor

core/widgets/menu.lua

@@ -36,8 +36,8 @@ table.insert(after_table,{
         resize = true
     },{
         bg = style.powercontrol_button_bg_focus,
-        forced_width = style.powercontrol_button_width,
+        forced_width = 24,
-        forced_height = style.powercontrol_button_height
+        forced_height = 24
     },{
         function()
             awful.spawn("loginctl poweroff")
@@ -49,8 +49,8 @@ table.insert(after_table,{
         resize = true,
     },{
         bg = style.powercontrol_button_bg_focus,
-        forced_width = style.powercontrol_button_width,
+        forced_width = 24,
-        forced_height = style.powercontrol_button_height
+        forced_height = 24
     },{
         function()
             awful.spawn("loginctl suspend")
@@ -62,8 +62,8 @@ table.insert(after_table,{
         resize = true,
     },{
         bg = style.powercontrol_button_bg_focus,
-        forced_width = style.powercontrol_button_width,
+        forced_width = 24,
-        forced_height = style.powercontrol_button_height
+        forced_height = 24
     },{
         function()
             awesome.emit_signal("lock_screen")
@@ -83,7 +83,7 @@ local menu_template = {
     vertical = true,
     inverse = true
 }
-menu = polymenu(menu_template)
+local menu = polymenu(menu_template)
 root.keys(gears.table.join(
     root.keys(),
     awful.key({ global.modkey,           }, "w", function () menu:show() end,

libs/README.txt

@@ -3,4 +3,4 @@ This folder contains various shared libraries, either in lua or in C.
 If the libraries are written in C, they could be installed using scripts that
 could be found in various-scripts/
 
-The documentation for each library is provided in docs/libs/libraryname.md (or it will be eventually)
+The documentation for each library is provided in docs/libs/libraryname.md

libs/awmtk.lua

@@ -187,7 +187,7 @@ awmtk.create_prefix = function(style,prefix,index)
     -- Create a prefix for new widgets to use
     local keys = index
     for _,k in pairs(keys) do
-        style[prefix..k] = style[prefix..k] or style[k]
+        style[prefix..k] = style[prefix..k] or style[k] or parent[k]
     end
     return style
 end
@@ -213,6 +213,7 @@ awmtk.style = function(parent,delta,prefix)
     new_style.inputbox = preprocess.inputbox(_new_style)
     return new_style
 end
+
 -- Default variables table
 defaults = setmetatable({},{
     __index = beautiful
@@ -234,8 +235,8 @@ defaults.shape_border_color = defaults.shape_border_color or defaults.bg_normal
 -- Extra variables
 defaults.inner_margin = defaults.inner_margin or 5
 defaults.rounding = defaults.rounding or 0
--- Generate classes variables
 local new_defaults = {}
+-- Generate classes variables
 for _,class in pairs(classes) do
     for parameter,value in pairs(defaults) do
         new_defaults[class..parameter] = ( 
@@ -256,14 +257,6 @@ defaults.icon_inner_margin = beautiful.icon_inner_margin or 0
 defaults.container_spacing = defaults.container_spacing or 2
 defaults.container_spacing_vertical = defaults.container_spacing_vertical or defaults.container_spacing
 defaults.container_spacing_horizontal = defaults.container_spacing_horizontal or defaults.container_spacing
---add button size defaults
-defaults.button_size = 20
-defaults.button_height = defaults.button_size
-defaults.button_width = defaults.button_size
---add icon size defaults
-defaults.icon_size = 20
-defaults.icon_height = defaults.icon_size
-defaults.icon_width = defaults.icon_size
 -- Templates for quick widget generation
 defaults.button_widget = defaults.button_widget or function(style) 
     return {

libs/debug.lua

@@ -1,17 +0,0 @@
-local naughty = require("naughty")
-local debug = {}
--- Thanks, u/skhil
--- (https://www.reddit.com/r/awesomewm/comments/te49nb/why_does_awesomes_ram_consumption_get_higher_and/)
-function debug.print_awesome_memory_stats(message)
-    print(os.date(), "\nLua memory usage:", collectgarbage("count"))
-    out_string = tostring(os.date()) .. "\nLua memory usage:"..tostring(collectgarbage("count")).."\n"
-    out_string = out_string .. "Objects alive:"
-    print("Objects alive:")
-    for name, obj in pairs{ button = button, client = client, drawable = drawable, drawin = drawin, key = key, screen = screen, tag = tag } do
-        out_string =out_string .. "\n" .. tostring(name) .. " = " ..tostring(obj.instances())
-        print(name, obj.instances())
-    end
-    naughty.notify({title = "Awesome WM memory statistics " .. message, text = out_string, timeout=20,hover_timeout=20})
-end
-
-return debug

libs/thumbnail.lua

@@ -13,6 +13,7 @@ thumbnailer.generate = function(path,thumb_path,height)
     assert(type(path) == "string", "argumenr #1 (path) is not a string")
     assert(type(thumb_path) == "string", "argument #2 (thumbnail path) is not a string")
     assert(type(height) == "number","argument #3 (height) is not a number")
+    require("naughty").notify({text = tostring(path).." "..tostring(thumb_path.." ")..tostring(height)})
     if execute("ls "..path) ~= 0 then
         return false, "unable to access image directory"
     end

presets/carbon-gnome/core/layout.lua

@@ -1,129 +0,0 @@
-local beautiful = require("beautiful")
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
--- {{{ Wibar
-
--- Create a wibox for each screen and add it
-
-local function set_wallpaper(s)
-    -- Wallpaper
-    if beautiful.wallpaper then
-        local wallpaper = beautiful.wallpaper
-        -- If wallpaper is a function, call it with the screen
-        if type(wallpaper) == "function" then
-            wallpaper = wallpaper(s)
-        end
-        gears.wallpaper.maximized(wallpaper, s, true)
-    end
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
--- {{{ Non-widget modules
--- The following modules are not exactly widgets, however they are part of the ui.
-
--- Load the keybindings list
-require("core.widgets.hotkeys_popup")
-
--- Load the menubar
-require("core.widgets.menubar")
--- }}}
-
-awful.screen.connect_for_each_screen(function(s)
-    -- Wallpaper
-    set_wallpaper(s)
-
-    -- Each screen has its own tag table.
-    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-
-    -- Create a promptbox for each screen
-    s.mypromptbox = require("core.widgets.prompt")()
-    -- Create an imagebox widget which will contain an icon indicating which layout we're using.
-    -- Create the taglist
-    s.mytaglist = require("core.widgets.taglist")(s)
-    -- We need one layoutbox per screen.
-    s.mylayoutbox = require("core.widgets.layout_box")(s)
-    -- Create a tasklist widget
-    s.mytasklist = require("core.widgets.tasklist")(s)
-    -- Create the wibox
-    s.mywibox = awful.wibar({
-        position = "top",
-        screen = s,
-        bg = beautiful.topbar_bg,
-    })
-    -- Add screen lock
-    require("widgets.lock")({screen = s, obscure = true})
-    require("widgets.unitybar")(s,{
-        top_widgets = {
-            require("widgets.polytasklist")({
-                vertical = true,
-                stretch = false,
-                --constraint = 180,
-                names = false,
-                margins = 5
-            })(s),
-        },
-        bottom_widgets = {
-            require("widgets.polylauncher")({vertical = true})
-        }
-    })
-    -- Add widgets to the wibox
-    s.mywibox:setup {
-        layout = wibox.layout.align.horizontal,
-        { -- Left widgets
-            layout = wibox.layout.fixed.horizontal,
-            {
-                {
-                    require("core.widgets.menu_launcher"),
-                    widget = wibox.container.place,
-                    halign = "center"
-                },
-                bg = "#26262633",
-                widget = wibox.container.background,
-                forced_width = require("beautiful.xresources").apply_dpi(61),
-            },
-            --require("widgets.polylauncher")({vertical = false}),
-            --s.mytaglist,
-            s.mypromptbox,
-            spacing = 3
-        },
-        -- Middle widget
-        {
-            --[[require("widgets.polytasklist")({
-                vertical = false,
-                stretch = false,
-                constraint = 180,
-                names = true,
-                margins = 5
-            })(s),]]
-            layout = wibox.layout.fixed.horizontal
-        },
-        { -- Right widgets
-            layout = wibox.layout.fixed.horizontal,
-            awful.widget.keyboardlayout(),
-            require("widgets.drawer")({
-                wibox.widget.systray(),
-                vertical = false
-            }),
-            require("widgets.wallpapers")({
-                screen = s,
-                path = os.getenv("HOME").."/Pictures/Wallpapers/",
-            }),
-            require("widgets.mailbox")({
-                screen = s,
-            }),
-            --wibox.widget.systray(),
-            require("widgets.volume")({}),
-            require("widgets.battery")({
-                percentage = true,
-            }),
-            wibox.widget.textclock(),
-            require("widgets.username")({}),
-            s.mylayoutbox,
-            spacing = 4
-        },
-    }
-end)
--- }}}

presets/carbon-gnome/core/titlebar.lua

@@ -1,155 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
-local menu = require("widgets.polymenu")
-local move_screentags = {}
-local toggle_screentags = {}
-awful.screen.connect_for_each_screen(function(s)
-    local move_tags = {}
-    local toggle_tags = {}
-    for _,tag in pairs(s.tags) do
-        table.insert(move_tags,{
-            tag.name,
-            function()
-                if client.focus then
-                    client.focus:tags({tag})
-                end
-            end
-        })
-        table.insert(toggle_tags,{
-            tag.name,
-            function()
-                if client.focus then
-                    local tags = client.focus:tags()
-                    for k,v in pairs(tags) do
-                        if v == tag then
-                            table.remove(tags,k)
-                            client.focus:tags(tags)
-                            return
-                        end
-                    end
-                    table.insert(tags,tag)
-                    client.focus:tags(tags)
-                end
-            end
-        })
-    end
-    table.insert(move_screentags,{
-        "Screen "..tostring(s.index),
-        move_tags
-    })
-    table.insert(toggle_screentags,{
-        "Screen "..tostring(s.index),
-        toggle_tags
-    })
-end)
-local controls_widget = wibox.widget {
-    forced_width = 72,
-    forced_height = 24,
-    layout = wibox.layout.fixed.horizontal,
-}
--- To conserve memory we keep one menu at a time
-local menu_widget = menu({
-    before = {
-        controls_widget
-    },
-    after = {
-        require("widgets.client-volume")({})
-    },
-    items = {
-        { "Move to tag" , 
-            move_screentags
-        },
-        { "Toggle on tag",
-            toggle_screentags
-        },
-        { "Stop task",
-            function() 
-                awful.spawn("kill "..tostring(c.pid))
-            end 
-        },
-        { "Kill task",
-            function() 
-                awful.spawn("kill -s KILL "..tostring(c.pid))
-            end 
-        },
-        { "Debug info",
-            {
-                before = {
-                    require("widgets.window-debug")()
-                }
-            }
-        }
-    },
-    vertical = true
-})
-
-return function(c)
-    local buttons = gears.table.join(
-        awful.button({ }, 1, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.move(c)
-        end),
-        awful.button({ }, 3, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.resize(c)
-        end)
-    )
-    c.menu_button = awful.titlebar.widget.iconwidget(c)
-    -- A little trick we do to conserve memory and cpu usage on regenerating
-    -- buttons is we pop up a menu in the location of the icon
-    -- and insert buttons into the controls widget layout.
-    c.hidden_floatingbutton = awful.titlebar.widget.floatingbutton(c)
-    c.hidden_stickybutton = awful.titlebar.widget.stickybutton(c)
-    c.hidden_ontopbutton = awful.titlebar.widget.ontopbutton(c)
-    c.menu_button:connect_signal("button::press", function()
-        menu_widget.toggle()
-        if controls_widget then
-            controls_widget:reset()
-            controls_widget:add(c.hidden_floatingbutton)
-            controls_widget:add(c.hidden_stickybutton)
-            controls_widget:add(c.hidden_ontopbutton)
-        end
-        c:emit_signal("request::activate", "titlebar", {raise = true})
-    end)
-    c:connect_signal("unfocus",function()
-        if menu_widget.visible then
-            menu_widget.toggle(0,0)
-        end
-    end)
-    return awful.titlebar(c) : setup {
-        { -- Left 
-            c.menu_button,
-            layout  = wibox.layout.fixed.horizontal
-        },
-        { -- Middle
-            awful.titlebar.widget.titlewidget(c),
-            buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
-        },
-        { -- Right
-            {
-                {
-                    awful.titlebar.widget.maximizedbutton(c),
-                    awful.titlebar.widget.minimizebutton (c),
-                    awful.titlebar.widget.closebutton    (c),
-                    layout = wibox.layout.fixed.horizontal(),
-                    widget = wibox.container.margin,
-                    margins = 3            
-                },
-                widget = wibox.container.background,
-                shape = gears.shape.rounded_bar,
-                bg = {
-                    type = "linear",
-                    from = { 0, 15 },
-                    to = { 0, 0},
-                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
-                },
-            },
-            widget = wibox.container.margin,
-            margins = 2
-        },
-        spacing = 10,
-        layout = wibox.layout.align.horizontal,
-    }
-end

presets/carbon-gnome/core/vars.lua

@@ -1,31 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
--- {{{ Variable definitions
-global = {}
-global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
-global.config_dir = os.getenv("HOME").."/.awesome/"
-global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/carbon/theme.lua"
-global.terminal = "xterm"
-global.editor = os.getenv("EDITOR") or "vim"
-global.editor_cmd = global.terminal .. " -e ".. global.editor
-global.modkey = "Mod4"
-awful.layout.layouts = {
-    awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier,
-    awful.layout.suit.corner.nw,
-    -- awful.layout.suit.corner.ne,
-    -- awful.layout.suit.corner.sw,
-    -- awful.layout.suit.corner.se,
-}
--- }}}

presets/carbon-xfce/core/layout.lua

@@ -1,104 +0,0 @@
-local beautiful = require("beautiful")
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
--- {{{ Wibar
-
--- Create a wibox for each screen and add it
-
-local function set_wallpaper(s)
-    -- Wallpaper
-    if beautiful.wallpaper then
-        local wallpaper = beautiful.wallpaper
-        -- If wallpaper is a function, call it with the screen
-        if type(wallpaper) == "function" then
-            wallpaper = wallpaper(s)
-        end
-        gears.wallpaper.maximized(wallpaper, s, true)
-    end
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
--- {{{ Non-widget modules
--- The following modules are not exactly widgets, however they are part of the ui.
-
--- Load the keybindings list
-require("core.widgets.hotkeys_popup")
-
--- Load the menubar
-require("core.widgets.menubar")
--- }}}
-
-awful.screen.connect_for_each_screen(function(s)
-    -- Wallpaper
-    set_wallpaper(s)
-
-    -- Each screen has its own tag table.
-    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-
-    -- Create a promptbox for each screen
-    s.mypromptbox = require("core.widgets.prompt")()
-    -- Create an imagebox widget which will contain an icon indicating which layout we're using.
-    -- Create the taglist
-    s.mytaglist = require("core.widgets.taglist")(s)
-    -- We need one layoutbox per screen.
-    s.mylayoutbox = require("core.widgets.layout_box")(s)
-    -- Create a tasklist widget
-    s.mytasklist = require("core.widgets.tasklist")(s)
-    -- Create the wibox
-    s.mywibox = awful.wibar({
-        position = "bottom",
-        screen = s,
-        bg = beautiful.topbar_bg,
-        border_width = 1,
-        border_color = beautiful.bg_normal
-    })
-    -- Add screen lock
-    require("widgets.lock")({screen = s, obscure = true})
-    -- Add widgets to the wibox
-    s.mywibox:setup {
-        layout = wibox.layout.align.horizontal,
-        { -- Left widgets
-            layout = wibox.layout.fixed.horizontal,
-            require("core.widgets.menu_launcher"),
-            require("widgets.polylauncher")({vertical = false}),
-            s.mypromptbox,
-            spacing = 3
-        },
-        -- Middle widget
-        {
-            require("widgets.polytasklist")({
-                constraint = 180,
-                names = true,
-                margins = 5
-            })(s),
-            layout = wibox.layout.fixed.horizontal
-        },
-        { -- Right widgets
-            layout = wibox.layout.fixed.horizontal,
-            awful.widget.keyboardlayout(),
-            require("widgets.drawer")({
-                wibox.widget.systray(),
-                vertical = false
-            }),
-            require("widgets.wallpapers")({
-                screen = s,
-                path = os.getenv("HOME").."/Pictures/Wallpapers/",
-            }),
-            require("widgets.mailbox")({
-                screen = s,
-            }),
-            --wibox.widget.systray(),
-            require("widgets.volume")({}),
-            require("widgets.battery")({
-                percentage = true,
-            }),
-            wibox.widget.textclock(),
-            s.mylayoutbox,
-            spacing = 4
-        },
-    }
-end)
--- }}}

presets/carbon-xfce/core/titlebar.lua

@@ -1,155 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
-local menu = require("widgets.polymenu")
-local move_screentags = {}
-local toggle_screentags = {}
-awful.screen.connect_for_each_screen(function(s)
-    local move_tags = {}
-    local toggle_tags = {}
-    for _,tag in pairs(s.tags) do
-        table.insert(move_tags,{
-            tag.name,
-            function()
-                if client.focus then
-                    client.focus:tags({tag})
-                end
-            end
-        })
-        table.insert(toggle_tags,{
-            tag.name,
-            function()
-                if client.focus then
-                    local tags = client.focus:tags()
-                    for k,v in pairs(tags) do
-                        if v == tag then
-                            table.remove(tags,k)
-                            client.focus:tags(tags)
-                            return
-                        end
-                    end
-                    table.insert(tags,tag)
-                    client.focus:tags(tags)
-                end
-            end
-        })
-    end
-    table.insert(move_screentags,{
-        "Screen "..tostring(s.index),
-        move_tags
-    })
-    table.insert(toggle_screentags,{
-        "Screen "..tostring(s.index),
-        toggle_tags
-    })
-end)
-local controls_widget = wibox.widget {
-    forced_width = 72,
-    forced_height = 24,
-    layout = wibox.layout.fixed.horizontal,
-}
--- To conserve memory we keep one menu at a time
-local menu_widget = menu({
-    before = {
-        controls_widget
-    },
-    after = {
-        require("widgets.client-volume")({})
-    },
-    items = {
-        { "Move to tag" , 
-            move_screentags
-        },
-        { "Toggle on tag",
-            toggle_screentags
-        },
-        { "Stop task",
-            function() 
-                awful.spawn("kill "..tostring(c.pid))
-            end 
-        },
-        { "Kill task",
-            function() 
-                awful.spawn("kill -s KILL "..tostring(c.pid))
-            end 
-        },
-        { "Debug info",
-            {
-                before = {
-                    require("widgets.window-debug")()
-                }
-            }
-        }
-    },
-    vertical = true
-})
-
-return function(c)
-    local buttons = gears.table.join(
-        awful.button({ }, 1, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.move(c)
-        end),
-        awful.button({ }, 3, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.resize(c)
-        end)
-    )
-    c.menu_button = awful.titlebar.widget.iconwidget(c)
-    -- A little trick we do to conserve memory and cpu usage on regenerating
-    -- buttons is we pop up a menu in the location of the icon
-    -- and insert buttons into the controls widget layout.
-    c.hidden_floatingbutton = awful.titlebar.widget.floatingbutton(c)
-    c.hidden_stickybutton = awful.titlebar.widget.stickybutton(c)
-    c.hidden_ontopbutton = awful.titlebar.widget.ontopbutton(c)
-    c.menu_button:connect_signal("button::press", function()
-        menu_widget.toggle()
-        if controls_widget then
-            controls_widget:reset()
-            controls_widget:add(c.hidden_floatingbutton)
-            controls_widget:add(c.hidden_stickybutton)
-            controls_widget:add(c.hidden_ontopbutton)
-        end
-        c:emit_signal("request::activate", "titlebar", {raise = true})
-    end)
-    c:connect_signal("unfocus",function()
-        if menu_widget.visible then
-            menu_widget.toggle(0,0)
-        end
-    end)
-    return awful.titlebar(c) : setup {
-        { -- Left 
-            c.menu_button,
-            layout  = wibox.layout.fixed.horizontal
-        },
-        { -- Middle
-            awful.titlebar.widget.titlewidget(c),
-            buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
-        },
-        { -- Right
-            {
-                {
-                    awful.titlebar.widget.maximizedbutton(c),
-                    awful.titlebar.widget.minimizebutton (c),
-                    awful.titlebar.widget.closebutton    (c),
-                    layout = wibox.layout.fixed.horizontal(),
-                    widget = wibox.container.margin,
-                    margins = 3            
-                },
-                widget = wibox.container.background,
-                shape = gears.shape.rounded_bar,
-                bg = {
-                    type = "linear",
-                    from = { 0, 15 },
-                    to = { 0, 0},
-                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
-                },
-            },
-            widget = wibox.container.margin,
-            margins = 2
-        },
-        spacing = 10,
-        layout = wibox.layout.align.horizontal,
-    }
-end

presets/carbon-xfce/core/vars.lua

@@ -1,31 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
--- {{{ Variable definitions
-global = {}
-global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
-global.config_dir = os.getenv("HOME").."/.awesome/"
-global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/carbon/theme.lua"
-global.terminal = "xterm"
-global.editor = os.getenv("EDITOR") or "vim"
-global.editor_cmd = global.terminal .. " -e ".. global.editor
-global.modkey = "Mod4"
-awful.layout.layouts = {
-    awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier,
-    awful.layout.suit.corner.nw,
-    -- awful.layout.suit.corner.ne,
-    -- awful.layout.suit.corner.sw,
-    -- awful.layout.suit.corner.se,
-}
--- }}}

presets/ubuntu-11.10/core/layout.lua

@@ -40,6 +40,7 @@ awful.screen.connect_for_each_screen(function(s)
 
     -- Create a promptbox for each screen
     s.mypromptbox = require("core.widgets.prompt")()
+    require("widgets.stickers")(s)
     -- Create an imagebox widget which will contain an icon indicating which layout we're using.
     -- Create the taglist
     s.mytaglist = require("core.widgets.taglist")(s)
@@ -67,81 +68,81 @@ awful.screen.connect_for_each_screen(function(s)
         },
         bottom_widgets = {
             require("widgets.polylauncher")({vertical = true})
-        },
+        }
-        position="left"
     })
-    -- Menu
-    require("core.widgets.menu")
-    -- Start button
-    local start_button = wibox.widget {
-        {
-            {
-                image = beautiful.awesome_icon,
-                widget = wibox.widget.imagebox
-            },
-            widget = wibox.container.place,
-            halign = "center",
-            id = "menu"
-        },
-        bg = "#26262633",
-        widget = wibox.container.background,
-        forced_width = require("beautiful.xresources").apply_dpi(61),
-    }
-    start_button:connect_signal("button::press",function(self,x,y,button)
-        if button == 1 then
-            menu:show()
-        end
-    end)
     -- Add widgets to the wibox
     s.mywibox:setup {
-        expand = "outside",
         layout = wibox.layout.align.horizontal,
-        { 
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
             {
-                -- Left widgets
+                {
-                start_button,
+                    require("core.widgets.menu_launcher"),
-                --require("widgets.polylauncher")({vertical = false}),
+                    widget = wibox.container.place,
-                --s.mytaglist,
+                    halign = "center"
-                s.mypromptbox,
+                },
-                layout = wibox.layout.fixed.horizontal,
+                bg = "#26262633",
-                spacing = 3
+                widget = wibox.container.background,
+                forced_width = require("beautiful.xresources").apply_dpi(61),
             },
-            widget = wibox.container.place,
+            --require("widgets.polylauncher")({vertical = false}),
-            halign = "left",
+            --s.mytaglist,
-            fill_horizontal = false
+            s.mypromptbox,
+            require("widgets.current_window")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            spacing = 3
         },
+        -- Middle widget
         {
+            --[[require("widgets.polytasklist")({
+                vertical = false,
+                stretch = false,
+                constraint = 180,
+                names = true,
+                margins = 5
+            })(s),]]
             layout = wibox.layout.fixed.horizontal
         },
-        { 
+        { -- Right widgets
-            {
+            layout = wibox.layout.fixed.horizontal,
-                -- Right widgets
+            awful.widget.keyboardlayout(),
-                require("widgets.drawer")({
+            require("widgets.wallpapers")({
-                    wibox.widget.systray(),
+                screen = s,
-                }),
+                path = os.getenv("HOME").."/Pictures/Wallpapers/",
-                require("widgets.wallpapers")({
+                style = {
-                    screen = s,
+                    icon_bg_normal = beautiful.topbar_bg
-                    path = os.getenv("HOME").."/Pictures/Wallpapers/",
+                }
-                }),
+            }),
-                require("widgets.mailbox")({
+            require("widgets.mailbox")({
-                    screen = s,
+                screen = s,
-                    style = {
+                style = {
-                        rounding = 1,
+                    rounding = 1,
-                    }
+                    icon_bg_normal = beautiful.topbar_bg
-                }),
+                }
-                require("widgets.volume")({}),
+            }),
-                require("widgets.battery")({
+            --wibox.widget.systray(),
-                    percentage = true,
+            require("widgets.volume")({
-                }),
+                style = {
-                awful.widget.keyboardlayout(),
+                    icon_bg_normal = beautiful.topbar_bg
-                wibox.widget.textclock(),
+                }
-                s.mylayoutbox,
+            }),
-                layout = wibox.layout.fixed.horizontal,
+            require("widgets.battery")({
-                spacing = 4,
+                percentage = true,
-            },
+                style = {
-            widget = wibox.container.place,
+                    icon_bg_normal = beautiful.topbar_bg
-            halign = "right",
+                }
-            fill_horizontal = false
+            }),
+            wibox.widget.textclock(),
+            require("widgets.username")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            s.mylayoutbox,
+            spacing = 4
         },
     }
 end)

presets/ubuntu-11.10/core/titlebar.lua

@@ -43,47 +43,6 @@ awful.screen.connect_for_each_screen(function(s)
         toggle_tags
     })
 end)
-local controls_widget = wibox.widget {
-    forced_width = 72,
-    forced_height = 24,
-    layout = wibox.layout.fixed.horizontal,
-}
--- To conserve memory we keep one menu at a time
-local menu_widget = menu({
-    before = {
-        controls_widget
-    },
-    after = {
-        require("widgets.client-volume")({})
-    },
-    items = {
-        { "Move to tag" , 
-            move_screentags
-        },
-        { "Toggle on tag",
-            toggle_screentags
-        },
-        { "Stop task",
-            function() 
-                awful.spawn("kill "..tostring(c.pid))
-            end 
-        },
-        { "Kill task",
-            function() 
-                awful.spawn("kill -s KILL "..tostring(c.pid))
-            end 
-        },
-        { "Debug info",
-            {
-                before = {
-                    require("widgets.window-debug")()
-                }
-            }
-        }
-    },
-    vertical = true
-})
-
 return function(c)
     local buttons = gears.table.join(
         awful.button({ }, 1, function()
@@ -95,26 +54,35 @@ return function(c)
             awful.mouse.client.resize(c)
         end)
     )
+    c.menu = menu({
+        before = {
+            {
+                awful.titlebar.widget.floatingbutton (c),
+                awful.titlebar.widget.stickybutton   (c),
+                awful.titlebar.widget.ontopbutton    (c),
+                forced_width = 72,
+                forced_height = 24,
+                layout = wibox.layout.fixed.horizontal,
+            }
+        },
+        items = {
+            { "Move to tag" , 
+                move_screentags
+            },
+            { "Toggle on tag",
+                toggle_screentags
+            }
+        },
+        vertical = true
+    })
     c.menu_button = awful.titlebar.widget.iconwidget(c)
-    -- A little trick we do to conserve memory and cpu usage on regenerating
-    -- buttons is we pop up a menu in the location of the icon
-    -- and insert buttons into the controls widget layout.
-    c.hidden_floatingbutton = awful.titlebar.widget.floatingbutton(c)
-    c.hidden_stickybutton = awful.titlebar.widget.stickybutton(c)
-    c.hidden_ontopbutton = awful.titlebar.widget.ontopbutton(c)
     c.menu_button:connect_signal("button::press", function()
-        menu_widget.toggle()
+        c.menu.toggle()
-        if controls_widget then
-            controls_widget:reset()
-            controls_widget:add(c.hidden_floatingbutton)
-            controls_widget:add(c.hidden_stickybutton)
-            controls_widget:add(c.hidden_ontopbutton)
-        end
         c:emit_signal("request::activate", "titlebar", {raise = true})
     end)
     c:connect_signal("unfocus",function()
-        if menu_widget.visible then
+        if c.menu.visible then
-            menu_widget.toggle(0,0)
+            c.menu.toggle(0,0)
         end
     end)
     return awful.titlebar(c) : setup {

presets/ubuntu-20.04/core/layout.lua

@@ -40,6 +40,7 @@ awful.screen.connect_for_each_screen(function(s)
 
     -- Create a promptbox for each screen
     s.mypromptbox = require("core.widgets.prompt")()
+    require("widgets.stickers")(s)
     -- Create an imagebox widget which will contain an icon indicating which layout we're using.
     -- Create the taglist
     s.mytaglist = require("core.widgets.taglist")(s)
@@ -71,50 +72,60 @@ awful.screen.connect_for_each_screen(function(s)
     })
     -- Add widgets to the wibox
     s.mywibox:setup {
-        expand = "outside",
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
-            {
+            layout = wibox.layout.fixed.horizontal,
-                require("core.widgets.menu_launcher"),
+            require("core.widgets.menu_launcher"),
-                --require("widgets.polylauncher")({vertical = false}),
+            --require("widgets.polylauncher")({vertical = false}),
-                --s.mytaglist,
+            --s.mytaglist,
-                s.mypromptbox,
+            s.mypromptbox,
-                layout = wibox.layout.fixed.horizontal,
+            require("widgets.current_window")({
-                spacing = 3
+                style = {
-            },
+                    icon_bg_normal = beautiful.topbar_bg
-            widget = wibox.container.place,
+                }
-            halign = "left",
+            }),
-            fill_horizontal = false,
+            spacing = 3
         },
         -- Middle widget
-        wibox.widget.textclock(),
+        {
+            widget = wibox.container.background
+        },
         { -- Right widgets
+            wibox.widget.textclock(),
             {
-                require("widgets.drawer")({
+                widget = wibox.container.background,
-                    wibox.widget.systray()
+                forced_width = (math.abs(s.geometry.width/2)-200)
-                }),
-                awful.widget.keyboardlayout(),
-                require("widgets.wallpapers")({
-                    screen = s,
-                    path = os.getenv("HOME").."/Pictures/Wallpapers/",
-                }),
-                require("widgets.mailbox")({
-                    screen = s,
-                    style = {
-                        rounding = 1,
-                    }
-                }),
-                require("widgets.volume")({}),
-                require("widgets.battery")({
-                    percentage = false,
-                }),
-                s.mylayoutbox,
-                layout = wibox.layout.fixed.horizontal,
-                spacing = 4
             },
-            widget = wibox.container.place,
+            layout = wibox.layout.fixed.horizontal,
-            halign = "right",
+            awful.widget.keyboardlayout(),
-            fill_horizontal = false
+            require("widgets.wallpapers")({
+                screen = s,
+                path = os.getenv("HOME").."/Pictures/Wallpapers/",
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            require("widgets.mailbox")({
+                screen = s,
+                style = {
+                    rounding = 1,
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            --wibox.widget.systray(),
+            require("widgets.volume")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            require("widgets.battery")({
+                percentage = false,
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
+            s.mylayoutbox,
+            spacing = 4
         },
     }
 end)

presets/ubuntu-20.04/core/titlebar.lua

@@ -43,47 +43,6 @@ awful.screen.connect_for_each_screen(function(s)
         toggle_tags
     })
 end)
-local controls_widget = wibox.widget {
-    forced_width = 72,
-    forced_height = 24,
-    layout = wibox.layout.fixed.horizontal,
-}
--- To conserve memory we keep one menu at a time
-local menu_widget = menu({
-    before = {
-        controls_widget
-    },
-    after = {
-        require("widgets.client-volume")({})
-    },
-    items = {
-        { "Move to tag" , 
-            move_screentags
-        },
-        { "Toggle on tag",
-            toggle_screentags
-        },
-        { "Stop task",
-            function() 
-                awful.spawn("kill "..tostring(c.pid))
-            end 
-        },
-        { "Kill task",
-            function() 
-                awful.spawn("kill -s KILL "..tostring(c.pid))
-            end 
-        },
-        { "Debug info",
-            {
-                before = {
-                    require("widgets.window-debug")()
-                }
-            }
-        }
-    },
-    vertical = true
-})
-
 return function(c)
     local buttons = gears.table.join(
         awful.button({ }, 1, function()
@@ -95,26 +54,35 @@ return function(c)
             awful.mouse.client.resize(c)
         end)
     )
+    c.menu = menu({
+        before = {
+            {
+                awful.titlebar.widget.floatingbutton (c),
+                awful.titlebar.widget.stickybutton   (c),
+                awful.titlebar.widget.ontopbutton    (c),
+                forced_width = 72,
+                forced_height = 24,
+                layout = wibox.layout.fixed.horizontal,
+            }
+        },
+        items = {
+            { "Move to tag" , 
+                move_screentags
+            },
+            { "Toggle on tag",
+                toggle_screentags
+            }
+        },
+        vertical = true
+    })
     c.menu_button = awful.titlebar.widget.iconwidget(c)
-    -- A little trick we do to conserve memory and cpu usage on regenerating
-    -- buttons is we pop up a menu in the location of the icon
-    -- and insert buttons into the controls widget layout.
-    c.hidden_floatingbutton = awful.titlebar.widget.floatingbutton(c)
-    c.hidden_stickybutton = awful.titlebar.widget.stickybutton(c)
-    c.hidden_ontopbutton = awful.titlebar.widget.ontopbutton(c)
     c.menu_button:connect_signal("button::press", function()
-        menu_widget.toggle()
+        c.menu.toggle()
-        if controls_widget then
-            controls_widget:reset()
-            controls_widget:add(c.hidden_floatingbutton)
-            controls_widget:add(c.hidden_stickybutton)
-            controls_widget:add(c.hidden_ontopbutton)
-        end
         c:emit_signal("request::activate", "titlebar", {raise = true})
     end)
     c:connect_signal("unfocus",function()
-        if menu_widget.visible then
+        if c.menu.visible then
-            menu_widget.toggle(0,0)
+            c.menu.toggle(0,0)
         end
     end)
     return awful.titlebar(c) : setup {

presets/ubuntu-phone/core/layout.lua

@@ -1,136 +0,0 @@
-local beautiful = require("beautiful")
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
--- {{{ Wibar
-
--- Create a wibox for each screen and add it
-
-local function set_wallpaper(s)
-    -- Wallpaper
-    if beautiful.wallpaper then
-        local wallpaper = beautiful.wallpaper
-        -- If wallpaper is a function, call it with the screen
-        if type(wallpaper) == "function" then
-            wallpaper = wallpaper(s)
-        end
-        gears.wallpaper.maximized(wallpaper, s, true)
-    end
-end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
-screen.connect_signal("property::geometry", set_wallpaper)
-
--- {{{ Non-widget modules
--- The following modules are not exactly widgets, however they are part of the ui.
-
--- Load the keybindings list
-require("core.widgets.hotkeys_popup")
-
--- Load the menubar
-require("core.widgets.menubar")
--- }}}
-
-awful.screen.connect_for_each_screen(function(s)
-    -- Wallpaper
-    set_wallpaper(s)
-
-    -- Each screen has its own tag table.
-    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-
-    -- Create a promptbox for each screen
-    s.mypromptbox = require("core.widgets.prompt")()
-    -- Create an imagebox widget which will contain an icon indicating which layout we're using.
-    -- Create the taglist
-    s.mytaglist = require("core.widgets.taglist")(s)
-    -- We need one layoutbox per screen.
-    s.mylayoutbox = require("core.widgets.layout_box")(s)
-    -- Create a tasklist widget
-    s.mytasklist = require("core.widgets.tasklist")(s)
-    -- Create the wibox
-    s.mywibox = awful.wibar({
-        position = "top",
-        screen = s,
-        bg = beautiful.topbar_bg,
-    })
-    -- Add screen lock
-    require("widgets.lock")({screen = s, obscure = true})
-    require("widgets.unitybar")(s,{
-        top_widgets = {
-            require("widgets.polytasklist")({
-                vertical = false,
-                stretch = false,
-                --constraint = 180,
-                names = false,
-                margins = 5
-            })(s),
-        },
-        bottom_widgets = {
-            require("widgets.polylauncher")({vertical = false})
-        },
-        position="bottom"
-    })
-    -- Menu
-    require("core.widgets.menu")
-    -- Start button
-    local start_button = wibox.widget {
-        {
-            {
-                image = beautiful.awesome_icon,
-                widget = wibox.widget.imagebox
-            },
-            widget = wibox.container.place,
-            halign = "center",
-            id = "menu"
-        },
-        bg = "#26262633",
-        widget = wibox.container.background,
-        forced_width = require("beautiful.xresources").apply_dpi(61),
-    }
-    start_button:connect_signal("button::press",function(self,x,y,button)
-        if button == 1 then
-            menu:show()
-        end
-    end)
-    -- Add widgets to the wibox
-    s.mywibox:setup {
-        expand = "outside",
-        layout = wibox.layout.align.horizontal,
-        { -- Left widgets
-            start_button,
-            layout = wibox.layout.fixed.horizontal,
-            --require("widgets.polylauncher")({vertical = false}),
-            --s.mytaglist,
-            s.mypromptbox,
-            spacing = 3
-        },
-        wibox.widget.textclock(),
-        { -- Right widgets
-            {
-                layout = wibox.layout.fixed.horizontal,
-                awful.widget.keyboardlayout(),
-                require("widgets.wallpapers")({
-                    screen = s,
-                    path = os.getenv("HOME").."/Pictures/Wallpapers/",
-                }),
-                require("widgets.mailbox")({
-                    screen = s,
-                    style = {
-                        rounding = 1,
-                    }
-                }),
-                --wibox.widget.systray(),
-                require("widgets.volume")({}),
-                require("widgets.battery")({
-                    percentage = true,
-                }),
-                s.mylayoutbox,
-                spacing = 4,
-            },
-            widget = wibox.container.place,
-            halign = "right",
-            fill_horizontal = true
-        },
-    }
-end)
--- }}}

presets/ubuntu-phone/core/titlebar.lua

@@ -1,155 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
-local menu = require("widgets.polymenu")
-local move_screentags = {}
-local toggle_screentags = {}
-awful.screen.connect_for_each_screen(function(s)
-    local move_tags = {}
-    local toggle_tags = {}
-    for _,tag in pairs(s.tags) do
-        table.insert(move_tags,{
-            tag.name,
-            function()
-                if client.focus then
-                    client.focus:tags({tag})
-                end
-            end
-        })
-        table.insert(toggle_tags,{
-            tag.name,
-            function()
-                if client.focus then
-                    local tags = client.focus:tags()
-                    for k,v in pairs(tags) do
-                        if v == tag then
-                            table.remove(tags,k)
-                            client.focus:tags(tags)
-                            return
-                        end
-                    end
-                    table.insert(tags,tag)
-                    client.focus:tags(tags)
-                end
-            end
-        })
-    end
-    table.insert(move_screentags,{
-        "Screen "..tostring(s.index),
-        move_tags
-    })
-    table.insert(toggle_screentags,{
-        "Screen "..tostring(s.index),
-        toggle_tags
-    })
-end)
-local controls_widget = wibox.widget {
-    forced_width = 72,
-    forced_height = 24,
-    layout = wibox.layout.fixed.horizontal,
-}
--- To conserve memory we keep one menu at a time
-local menu_widget = menu({
-    before = {
-        controls_widget
-    },
-    after = {
-        require("widgets.client-volume")({})
-    },
-    items = {
-        { "Move to tag" , 
-            move_screentags
-        },
-        { "Toggle on tag",
-            toggle_screentags
-        },
-        { "Stop task",
-            function() 
-                awful.spawn("kill "..tostring(client.focus.pid))
-            end 
-        },
-        { "Kill task",
-            function() 
-                awful.spawn("kill -s KILL "..tostring(client.focus.pid))
-            end 
-        },
-        { "Debug info",
-            {
-                before = {
-                    require("widgets.window-debug")()
-                }
-            }
-        }
-    },
-    vertical = true
-})
-
-return function(c)
-    local buttons = gears.table.join(
-        awful.button({ }, 1, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.move(c)
-        end),
-        awful.button({ }, 3, function()
-            c:emit_signal("request::activate", "titlebar", {raise = true})
-            awful.mouse.client.resize(c)
-        end)
-    )
-    c.menu_button = awful.titlebar.widget.iconwidget(c)
-    -- A little trick we do to conserve memory and cpu usage on regenerating
-    -- buttons is we pop up a menu in the location of the icon
-    -- and insert buttons into the controls widget layout.
-    c.hidden_floatingbutton = awful.titlebar.widget.floatingbutton(c)
-    c.hidden_stickybutton = awful.titlebar.widget.stickybutton(c)
-    c.hidden_ontopbutton = awful.titlebar.widget.ontopbutton(c)
-    c.menu_button:connect_signal("button::press", function()
-        menu_widget.toggle()
-        if controls_widget then
-            controls_widget:reset()
-            controls_widget:add(c.hidden_floatingbutton)
-            controls_widget:add(c.hidden_stickybutton)
-            controls_widget:add(c.hidden_ontopbutton)
-        end
-        c:emit_signal("request::activate", "titlebar", {raise = true})
-    end)
-    c:connect_signal("unfocus",function()
-        if menu_widget.visible then
-            menu_widget.toggle(0,0)
-        end
-    end)
-    return awful.titlebar(c) : setup {
-        { -- Left 
-            c.menu_button,
-            layout  = wibox.layout.fixed.horizontal
-        },
-        { -- Middle
-            awful.titlebar.widget.titlewidget(c),
-            buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
-        },
-        { -- Right
-            {
-                {
-                    awful.titlebar.widget.maximizedbutton(c),
-                    awful.titlebar.widget.minimizebutton (c),
-                    awful.titlebar.widget.closebutton    (c),
-                    layout = wibox.layout.fixed.horizontal(),
-                    widget = wibox.container.margin,
-                    margins = 3            
-                },
-                widget = wibox.container.background,
-                shape = gears.shape.rounded_bar,
-                bg = {
-                    type = "linear",
-                    from = { 0, 15 },
-                    to = { 0, 0},
-                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
-                },
-            },
-            widget = wibox.container.margin,
-            margins = 2
-        },
-        spacing = 10,
-        layout = wibox.layout.align.horizontal,
-    }
-end

presets/ubuntu-phone/core/vars.lua

@@ -1,31 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
--- {{{ Variable definitions
-global = {}
-global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
-global.config_dir = os.getenv("HOME").."/.awesome/"
-global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/unity/theme.lua"
-global.terminal = "xterm"
-global.editor = os.getenv("EDITOR") or "vim"
-global.editor_cmd = global.terminal .. " -e ".. global.editor
-global.modkey = "Mod4"
-awful.layout.layouts = {
-    awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
-    awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
-    awful.layout.suit.spiral,
-    awful.layout.suit.spiral.dwindle,
-    awful.layout.suit.max,
-    awful.layout.suit.max.fullscreen,
-    awful.layout.suit.magnifier,
-    awful.layout.suit.corner.nw,
-    -- awful.layout.suit.corner.ne,
-    -- awful.layout.suit.corner.sw,
-    -- awful.layout.suit.corner.se,
-}
--- }}}

rc.lua

@@ -28,6 +28,7 @@ require("awful.hotkeys_popup.keys")
 require("core.error")
 require("core.vars")
 require("core.style")
+require("themes.icons")
 require("core.binds")
 require("core.layout")
 require("core.rules")

themes/carbon/icons/README.md

@@ -1,9 +1,5 @@
-lock/shutdown/suspend icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later)
+battery status icons, lock/shutdown/suspend icons, volume status icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later)
 
-the fallback-application.svg was taken from https://en.wikipedia.org/wiki/File:X.Org\_Logo.svg, distributed under the CC-BY-SA 3.0 license
+battery status icons in particular were modified to look somewhat less ugly when recolored to a single color. this was done because the config automatically recolors all icons to the color value of the foreground (text) color.
-
-logout icon is taken from the adwaita project, licenses from https://gitlab.gnome.org/GNOME/adwaita-icon-theme apply.
-
-all other icons should have the copyright and license attached to them as svg metadata.
 
 the author of this config does not claim copyright of any icons present in this folder unless stated otherwise in the icon's license metadata.

themes/carbon/icons/battery-caution-charging-symbolic.svg

@@ -1,138 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+            .ColorScheme-PositiveText {
-   version="1.1"
+                color:#27ae60;
-   id="svg5"
+            }
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+        </style>
-   sodipodi:docname="battery-caution-charging-symbolic.svg"
+    </defs>
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M3 4l1 8H2V4zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/><path d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z" class="ColorScheme-PositiveText" fill="currentColor"/></svg>
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="8"
-     inkscape:cx="12.75"
-     inkscape:cy="8.375"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g952"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14673;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="0.71062315"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/carbon/icons/battery-caution-symbolic.svg

@@ -1,123 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+        </style>
-   version="1.1"
+    </defs>
-   id="svg5"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M3 4l1 8H2V4zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/></svg>
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-caution-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="12.4375"
-     inkscape:cy="17.375"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g946"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14673;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="0.71062315"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0" />
-    </g>
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/carbon/icons/battery-empty-charging-symbolic.svg

@@ -1,148 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+            .ColorScheme-PositiveText {
-   version="1.1"
+                color:#27ae60;
-   id="svg5"
+            }
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+        </style>
-   sodipodi:docname="battery-empty-charging-symbolic.svg"
+    </defs>
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/><path d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z" class="ColorScheme-PositiveText" fill="currentColor"/></svg>
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="4.125"
-     inkscape:cy="22.625"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1046"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-6"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/carbon/icons/battery-empty-symbolic.svg

@@ -1,147 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+        </style>
-   version="1.1"
+    </defs>
-   id="svg5"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/></svg>
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-empty-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-19.533824"
-     inkscape:cy="17.677669"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect2493">
-      <path
-         id="path2491"
-         style="color:#000000;fill:#000000;stroke-width:1;stroke-linecap:round;-inkscape-stroke:none"
-         d="m 4.0963908,4.8798054 a 0.1322915,0.1322915 0 0 0 -0.079065,0.038241 0.1322915,0.1322915 0 0 0 0,0.1855181 L 5.2642781,6.35 4.0173259,7.5959187 a 0.1322915,0.1322915 0 0 0 0,0.1870689 0.1322915,0.1322915 0 0 0 0.1875854,0 L 5.4508299,6.5365519 6.6972656,7.7829876 a 0.1322915,0.1322915 0 0 0 0.1855184,0 0.1322915,0.1322915 0 0 0 0,-0.1870689 L 5.6368654,6.35 6.882784,5.1035643 a 0.1322915,0.1322915 0 0 0 0,-0.1855181 0.1322915,0.1322915 0 0 0 -0.1855184,0 L 5.4508299,6.1639648 4.2049113,4.9180462 A 0.1322915,0.1322915 0 0 0 4.0963908,4.8798054 Z" />
-    </mask>
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect2493"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect2493"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="rect846"
-       width="9.6418304"
-       height="5.442944"
-       x="1.0906231"
-       y="3.6285279"
-       sodipodi:type="rect"
-       ry="0.22999418"
-       d="m 1.3206173,3.6285279 h 9.1818417 c 0.127417,0 0.229995,0.1025774 0.229995,0.2299942 v 4.9829557 c 0,0.1274167 -0.102578,0.2299941 -0.229995,0.2299941 H 1.3206173 c -0.1274168,0 -0.2299942,-0.1025774 -0.2299942,-0.2299941 V 3.8585221 c 0,-0.1274168 0.1025774,-0.2299942 0.2299942,-0.2299942 z" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:0.5568;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       id="rect2450-6"
-       width="0.86209512"
-       height="2.135709"
-       x="10.747282"
-       y="5.2821455"
-       ry="0.14228392" />
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/carbon/icons/battery-full-charged-symbolic.svg

@@ -1,165 +1,70 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-full-charged-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg2037"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-full-charged-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="4.125"
-     inkscape:cy="22.625"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:none;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         id="lpe_path-effect5696"
-         style="display:inline;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         class="powerclip"
-         d="M -3.156273,-0.45360136 H 13.949959 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 5.2801724,6.6323131 5.5112954,7.3282799 8.5796549,5.7950767 5.977827,6.0676867 Z" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g956"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.464002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="7.1062322"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0"
-         clip-path="url(#clipPath5692)"
-         inkscape:path-effect="#path-effect5696"
-         d="M 1.843727,4.5463986 H 8.9499592 V 8.1536007 H 1.843727 Z"
-         sodipodi:type="rect" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata2041">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview2039"
+     showgrid="false"
+     inkscape:zoom="55.625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2037" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+            .ColorScheme-PositiveText {
+                color:#27ae60;
+            }
+        </style>
+  </defs>
+  <path
+     id="path2033"
+     style="fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 13 12 L 13 4 L 2 4 z M 9 4.5 L 9.5 4.5 L 9.5 5.5 L 11.5 5.5 L 11.5 7.5 L 9.5 7.5 L 9.5 8.5 L 11.5 8.5 L 11.5 10.5 L 9.5 10.5 L 9.5 11.5 L 9 11.5 C 7.666557 11.498032 6.5431396 10.671338 5.9570312 9.5 L 4.5 9.5 L 4.5 6.5 L 5.9550781 6.5 C 6.5415944 5.3280543 7.6657892 4.5010796 9 4.5 z M 8.5 5.6601562 C 7.6694626 5.8434029 6.9366841 6.3396817 6.6445312 7.1660156 L 6.5273438 7.5 L 5.5 7.5 L 5.5 8.5 L 6.5292969 8.5 L 6.6464844 8.8339844 C 6.9384669 9.6598387 7.6700159 10.156243 8.5 10.339844 L 8.5 9.5 L 8.5 6.5 L 8.5 5.6601562 z " />
+  <path
+     d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z"
+     class="ColorScheme-PositiveText"
+     fill="currentColor"
+     id="path2035"
+     style="fill:#27ae60;stroke:none;stroke-opacity:1;fill-opacity:1" />
 </svg>

themes/carbon/icons/battery-full-charging-symbolic.svg

@@ -1,165 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-full-charging-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg942"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-full-charging-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="8"
-     inkscape:cx="-4.625"
-     inkscape:cy="18.5"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:none;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         id="lpe_path-effect5696"
-         style="display:inline;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         class="powerclip"
-         d="M -3.156273,-0.45360136 H 13.949959 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 5.2801724,6.6323131 5.5112954,7.3282799 8.5796549,5.7950767 5.977827,6.0676867 Z" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1036"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.464002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="7.1062322"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0"
-         clip-path="url(#clipPath5692)"
-         inkscape:path-effect="#path-effect5696"
-         d="M 1.843727,4.5463986 H 8.9499592 V 8.1536007 H 1.843727 Z"
-         sodipodi:type="rect" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata946">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview944"
+     showgrid="false"
+     inkscape:zoom="48.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg942" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+            .ColorScheme-PositiveText {
+                color:#27ae60;
+            }
+        </style>
+  </defs>
+  <path
+     id="path938"
+     style="fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 13 12 L 13 4 L 2 4 z M 9 4.5 L 9.5 4.5 L 9.5 5.5 L 11.5 5.5 L 11.5 7.5 L 9.5 7.5 L 9.5 8.5 L 11.5 8.5 L 11.5 10.5 L 9.5 10.5 L 9.5 11.5 L 9 11.5 C 7.666557 11.498032 6.5431396 10.671338 5.9570312 9.5 L 4.5 9.5 L 4.5 6.5 L 5.9550781 6.5 C 6.5415944 5.3280543 7.6657892 4.5010796 9 4.5 z M 8.5 5.6601562 C 7.6694626 5.8434029 6.9366841 6.3396817 6.6445312 7.1660156 L 6.5273438 7.5 L 5.5 7.5 L 5.5 8.5 L 6.5292969 8.5 L 6.6464844 8.8339844 C 6.9384669 9.6598387 7.6700159 10.156243 8.5 10.339844 L 8.5 9.5 L 8.5 6.5 L 8.5 5.6601562 z " />
+  <path
+     d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z"
+     class="ColorScheme-PositiveText"
+     fill="currentColor"
+     id="path940" />
 </svg>

themes/carbon/icons/battery-full-symbolic.svg

@@ -1,109 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-full-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg1375"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-full-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="17.577516"
-     inkscape:cx="1.4222715"
-     inkscape:cy="23.609707"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g938"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="7.1062317"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0" />
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata1379">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview1377"
+     showgrid="false"
+     inkscape:zoom="55.625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1375" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+        </style>
+  </defs>
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     class="ColorScheme-Text"
+     d="M2 4h11v8H2zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"
+     id="path1373" />
 </svg>

themes/carbon/icons/battery-good-charging-symbolic.svg

@@ -1,165 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-good-charging-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg1149"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-good-charging-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-17.324115"
-     inkscape:cy="22.008698"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect4014"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4010">
-      <path
-         id="path4012"
-         style="display:none;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         id="lpe_path-effect4014"
-         style="display:inline;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         class="powerclip"
-         d="M -3.156273,-0.45360136 H 11.53384 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 5.2801724,6.6323131 5.5112954,7.3282799 8.5796549,5.7950767 5.977827,6.0676867 Z" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g956"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.376956;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="4.6901131"
-         height="3.6072023"
-         x="1.843727"
-         y="4.5463986"
-         ry="0"
-         clip-path="url(#clipPath4010)"
-         inkscape:path-effect="#path-effect4014"
-         d="M 1.843727,4.5463986 H 6.5338401 V 8.1536009 H 1.843727 Z"
-         sodipodi:type="rect" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata1153">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview1151"
+     showgrid="false"
+     inkscape:zoom="55.625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1149" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+            .ColorScheme-PositiveText {
+                color:#27ae60;
+            }
+        </style>
+  </defs>
+  <path
+     id="path1145"
+     style="fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 10 12 L 9.8125 10.5 L 9.5 10.5 L 9.5 11.5 L 9 11.5 C 7.666557 11.498032 6.5431396 10.671338 5.9570312 9.5 L 4.5 9.5 L 4.5 6.5 L 5.9550781 6.5 C 6.5415944 5.3280543 7.6657892 4.5010796 9 4.5 L 9.0625 4.5 L 9 4 L 2 4 z M 8.5 5.6601562 C 7.6694626 5.8434029 6.9366841 6.3396817 6.6445312 7.1660156 L 6.5273438 7.5 L 5.5 7.5 L 5.5 8.5 L 6.5292969 8.5 L 6.6464844 8.8339844 C 6.9384669 9.6598387 7.6700159 10.156243 8.5 10.339844 L 8.5 9.5 L 8.5 6.5 L 8.5 5.6601562 z M 9.5 8 L 9.5 8.5 L 9.5625 8.5 L 9.5 8 z " />
+  <path
+     d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z"
+     class="ColorScheme-PositiveText"
+     fill="currentColor"
+     id="path1147" />
 </svg>

themes/carbon/icons/battery-good-symbolic.svg

@@ -1,140 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-good-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg2062"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-good-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-7.9549509"
-     inkscape:cy="24.837125"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect4014"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4010">
-      <path
-         id="path4012"
-         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1051"
-       transform="matrix(1.2,0,0,1.2,-0.55902554,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993"
-         width="0.71799999" />
-      <rect
-         style="display:inline;opacity:1;fill:#000000;stroke-width:0.0649999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect4609"
-         width="4.6901131"
-         height="3.6072018"
-         x="1.8437274"
-         y="4.5463986" />
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata2066">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview2064"
+     showgrid="false"
+     inkscape:zoom="55.625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2062" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+        </style>
+  </defs>
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     class="ColorScheme-Text"
+     d="M2 4h7l1 8H2zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"
+     id="path2060" />
 </svg>

themes/carbon/icons/battery-low-charging-symbolic.svg

@@ -1,165 +1,71 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-low-charging-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg186"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-low-charging-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-19.091882"
-     inkscape:cy="15.291183"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect2566"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath2562">
-      <path
-         id="path2564"
-         style="display:none;stroke-width:0.464;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 6.1284829,6.5216392 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="cccc" />
-      <path
-         id="lpe_path-effect2566"
-         style="stroke-width:0.464;stroke-linecap:round"
-         class="powerclip"
-         d="M -3.156273,-0.45360136 H 9.1887835 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 6.1284829,6.5216392 Z" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g956"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.266548;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="2.3450565"
-         height="3.6072023"
-         x="1.843727"
-         y="4.5463986"
-         ry="0"
-         clip-path="url(#clipPath2562)"
-         inkscape:path-effect="#path-effect2566"
-         d="M 1.843727,4.5463986 H 4.1887835 V 8.1536009 H 1.843727 Z"
-         sodipodi:type="rect" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata190">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview188"
+     showgrid="false"
+     inkscape:zoom="55.625"
+     inkscape:cx="4.8629213"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg186"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+            .ColorScheme-PositiveText {
+                color:#27ae60;
+            }
+        </style>
+  </defs>
+  <path
+     id="path182"
+     style="fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 7 12 L 6.9023438 11.216797 C 6.3121937 10.79667 5.8272405 10.219642 5.5019531 9.5390625 L 3.8105469 9.5390625 L 3.8105469 6.1386719 L 5.5 6.1386719 C 5.6724011 5.7776582 5.8893752 5.4445919 6.1425781 5.1484375 L 6 4 L 2 4 z M 6.3164062 6.5195312 C 6.2712485 6.6120311 6.2247627 6.704817 6.1894531 6.8046875 L 6.0722656 7.1386719 L 4.8105469 7.1386719 L 4.8105469 8.5390625 L 6.0742188 8.5390625 L 6.1933594 8.8710938 C 6.3129661 9.2093939 6.4966297 9.5009695 6.71875 9.7539062 L 6.3164062 6.5195312 z " />
+  <path
+     d="M 9.1101126,4.2382021 A 3.6000002,3.6000001 0 0 0 5.7189123,6.6382022 H 4.3101122 v 2.4000001 h 1.4112001 a 3.6000002,3.6000001 0 0 0 3.3888003,2.3999997 v -1.2 H 11.510112 V 9.0382023 H 9.1101126 V 6.6382022 H 11.510112 V 5.4382021 H 9.1101126 Z"
+     class="ColorScheme-PositiveText"
+     fill="currentColor"
+     id="path184"
+     style="color:#27ae60;stroke-width:1.2;stroke-miterlimit:4;stroke-dasharray:none;fill:#44ae60;fill-opacity:1;paint-order:markers fill stroke" />
 </svg>

themes/carbon/icons/battery-low-symbolic.svg

@@ -1,141 +1,62 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-low-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg2762"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-low-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="-6.4375"
-     inkscape:cy="17.5"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect2153"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath2149">
-      <path
-         id="path2151"
-         style="display:block;stroke-width:0.464;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 6.1284829,6.5216392 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="cccc" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g949"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <rect
-         style="display:inline;fill:#000000;stroke-width:0.464;stroke-linecap:round"
-         id="rect2592"
-         width="2.3450565"
-         height="3.6072018"
-         x="1.8437271"
-         y="4.5463986"
-         ry="0" />
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata2766">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview2764"
+     showgrid="false"
+     inkscape:zoom="55.625"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2762" />
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+        </style>
+  </defs>
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     class="ColorScheme-Text"
+     d="M2 4h4l1 8H2zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"
+     id="path2760" />
 </svg>

themes/carbon/icons/battery-missing-symbolic.svg

@@ -1,186 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
-   width="48"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="48"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-missing-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
+   xmlns:svg="http://www.w3.org/2000/svg"
-  <sodipodi:namedview
+   xmlns="http://www.w3.org/2000/svg"
-     id="namedview7"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-     pagecolor="#ffffff"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-     bordercolor="#666666"
+   height="16"
-     borderopacity="1.0"
+   width="16"
-     inkscape:pageshadow="2"
+   version="1.1"
-     inkscape:pageopacity="0.0"
+   id="svg258"
-     inkscape:pagecheckerboard="0"
+   sodipodi:docname="battery-missing-symbolic.svg"
-     inkscape:document-units="mm"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-     showgrid="false"
-     units="px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-19.533824"
-     inkscape:cy="17.677669"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect2493">
-      <path
-         id="mask-powermask-path-effect2493_box"
-         style="fill:#ffffff;fill-opacity:1"
-         d="M 2.6473281,3.5463986 H 8.2545304 V 9.1536007 H 2.6473281 Z" />
-      <path
-         id="path2491"
-         style="color:#000000;fill:#000000;stroke-width:1;stroke-linecap:round;-inkscape-stroke:none"
-         d="m 4.0963908,4.8798054 a 0.1322915,0.1322915 0 0 0 -0.079065,0.038241 0.1322915,0.1322915 0 0 0 0,0.1855181 L 5.2642781,6.35 4.0173259,7.5959187 a 0.1322915,0.1322915 0 0 0 0,0.1870689 0.1322915,0.1322915 0 0 0 0.1875854,0 L 5.4508299,6.5365519 6.6972656,7.7829876 a 0.1322915,0.1322915 0 0 0 0.1855184,0 0.1322915,0.1322915 0 0 0 0,-0.1870689 L 5.6368654,6.35 6.882784,5.1035643 a 0.1322915,0.1322915 0 0 0 0,-0.1855181 0.1322915,0.1322915 0 0 0 -0.1855184,0 L 5.4508299,6.1639648 4.2049113,4.9180462 A 0.1322915,0.1322915 0 0 0 4.0963908,4.8798054 Z" />
-    </mask>
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect2493"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect2493"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-    <filter
-       id="mask-powermask-path-effect2493_inverse"
-       inkscape:label="filtermask-powermask-path-effect2493"
-       style="color-interpolation-filters:sRGB"
-       height="100"
-       width="100"
-       x="-50"
-       y="-50">
-      <feColorMatrix
-         id="mask-powermask-path-effect2493_primitive1"
-         values="1"
-         type="saturate"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="mask-powermask-path-effect2493_primitive2"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
-         in="fbSourceGraphic" />
-    </filter>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1195"
-       transform="matrix(1.2,0,0,1.2,-0.56467308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-6"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <path
-         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.330586;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560-6"
-         width="3.6072023"
-         height="3.6072021"
-         x="3.6473281"
-         y="4.5463986"
-         ry="0.2215627"
-         sodipodi:type="rect"
-         mask="url(#mask-powermask-path-effect2493)"
-         inkscape:path-effect="#path-effect2493"
-         transform="translate(-0.06601804,-0.02563844)"
-         d="m 3.8688908,4.5463986 h 3.1640769 c 0.1227458,0 0.2215627,0.098817 0.2215627,0.2215627 V 7.932038 c 0,0.1227457 -0.098817,0.2215627 -0.2215627,0.2215627 H 3.8688908 c -0.1227457,0 -0.2215627,-0.098817 -0.2215627,-0.2215627 V 4.7679613 c 0,-0.1227457 0.098817,-0.2215627 0.2215627,-0.2215627 z" />
-    </g>
-  </g>
   <metadata
-     id="metadata4105">
+     id="metadata262">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <cc:license
+        <dc:format>image/svg+xml</dc:format>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1026"
+     inkscape:window-height="856"
+     id="namedview260"
+     showgrid="true"
+     inkscape:zoom="32"
+     inkscape:cx="5.2458034"
+     inkscape:cy="7.7083638"
+     inkscape:window-x="49"
+     inkscape:window-y="143"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg258"
+     showguides="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid348" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+            .ColorScheme-Text {
+                color:#232629;
+            }
+            .ColorScheme-NegativeText {
+                color:#da4453;
+            }
+        </style>
+  </defs>
+  <path
+     id="path252"
+     style="fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 3 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 13 12 L 13 4 L 2 4 z M 5.4140625 5 L 7.7070312 7.2929688 L 10 5 L 10.707031 5.7070312 L 8.4140625 8 L 10.707031 10.292969 L 10 11 L 7.7070312 8.7070312 L 5.4140625 11 L 4.7070312 10.292969 L 7 8 L 4.7070312 5.7070312 L 5.4140625 5 z " />
 </svg>

themes/carbon/icons/drawer-closed.svg

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="48"
-   height="48"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="drawer-closed.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="6.6340405"
-     inkscape:cx="3.1654917"
-     inkscape:cy="25.097827"
-     inkscape:window-width="1132"
-     inkscape:window-height="576"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid9" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="rect85"
-       style="fill:#ffffff;fill-rule:evenodd;stroke-width:0.132288"
-       d="M 4.6963541,6.3497502 8.0036458,8.3340001 V 4.3655002 Z"
-       sodipodi:nodetypes="cccc" />
-  </g>
-  <metadata
-     id="metadata676">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/carbon/icons/drawer-open.svg

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="48"
-   height="48"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="drawer-open.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="6.6340405"
-     inkscape:cx="3.1654917"
-     inkscape:cy="25.097827"
-     inkscape:window-width="1024"
-     inkscape:window-height="576"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid9" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="rect85"
-       style="fill:#ffffff;fill-rule:evenodd;stroke-width:0.132288"
-       d="M 8.0036458,6.3497502 4.6963541,8.3340001 V 4.3655002 Z"
-       sodipodi:nodetypes="cccc" />
-  </g>
-  <metadata
-     id="metadata602">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/carbon/icons/fallback-application.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="48"
-   height="48"
-   version="1.1"
-   id="svg20"
-   sodipodi:docname="fallback-application.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview22"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="7.148952"
-     inkscape:cx="16.505916"
-     inkscape:cy="25.458277"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg20"
-     showguides="false" />
-  <style
-     type="text/css"
-     id="style2"><![CDATA[
-#P1 {fill:url(#LO)}
-rect {opacity:.40740739;fill:#000cff;width:.50507629;height:0}
-]]></style>
-  <defs
-     id="defs9">
-    <linearGradient
-       id="LO"
-       gradientUnits="userSpaceOnUse"
-       x1="319.20822"
-       y1="235.14877"
-       x2="657.65295"
-       y2="269.49396">
-      <stop
-         style="stop-color:#e54c18"
-         offset="0"
-         id="stop4" />
-      <stop
-         style="stop-color:#fec350"
-         offset="1"
-         id="stop6" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.12,0,0,0.12,15.214064,0.30035442)"
-     id="g18">
-    <g
-       transform="translate(-413.2102,-40.70387)"
-       id="g14">
-      <path
-         d="M 342.0739,390.70219 453.17118,245.44599 338.79445,85.733013 412.30881,85.794093 503.44682,211.37696 367.17669,390.70219 Z M 559.52169,390.8049 469.01289,265.00644 606.41773,85.596933 h 24.48173 L 519.34879,231.53848 633.03722,390.8049 Z"
-         id="path11" />
-      <path
-         id="P1"
-         d="m 486.41071,143.82651 c -8.85103,0 -18.30729,0.68536 -26.82011,1.50253 15.16593,19.77999 27.75007,36.52951 42.23287,55.55188 -8.12876,-17.49293 -24.83564,-34.26759 -19.05997,-42.89467 5.71717,-8.53969 16.25107,-7.10232 17.05346,-7.10232 16.88849,0 33.14525,1.90739 48.34375,5.4375 l 3.5625,-4.90625 c -20.27081,-5.21826 -42.28849,-7.58867 -65.3125,-7.58867 z m 91.46875,15.96367 -3.28125,4.6875 c 46.8258,18.33664 78.5,53.36029 78.5,93.49999 0,59.10603 -68.66485,107.0625 -153.28125,107.0625 -84.6164,-10e-6 -153.3125,-47.95648 -153.3125,-107.0625 1e-5,-32.18776 20.37158,-61.08002 52.59375,-80.71874 l -9.90625,-15.09375 c -50.54614,21.43183 -84.09374,59.04962 -84.09375,101.87499 0,66.63368 81.2225,120.6875 181.3125,120.6875 100.08999,0 181.34374,-54.05381 181.34375,-120.6875 0,-44.43292 -36.12255,-83.29245 -89.875,-104.24999 z"
-         style="fill:url(#LO)" />
-    </g>
-    <rect
-       x="322.36493"
-       y="180.85307"
-       width="0.50507629"
-       height="0"
-       id="rect16" />
-  </g>
-</svg>

themes/carbon/icons/mail.svg

@@ -26,9 +26,9 @@
      inkscape:document-units="mm"
      showgrid="false"
      units="px"
-     inkscape:zoom="16"
+     inkscape:zoom="12.429181"
-     inkscape:cx="16.90625"
+     inkscape:cx="20.636919"
-     inkscape:cy="17.625"
+     inkscape:cy="24.699939"
      inkscape:window-width="1861"
      inkscape:window-height="1036"
      inkscape:window-x="57"
@@ -37,43 +37,6 @@
      inkscape:current-layer="layer1" />
   <defs
      id="defs2">
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect1636"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect1636"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect4593"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect4593"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect2911"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect2911"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 6.35 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12.7 : 6.35 : 1"
-       inkscape:persp3d-origin="6.35 : 4.2333333 : 1"
-       id="perspective1831" />
     <inkscape:path-effect
        effect="powermask"
        id="path-effect1426"
@@ -87,6 +50,10 @@
     <mask
        maskUnits="userSpaceOnUse"
        id="mask-powermask-path-effect1426">
+      <path
+         id="mask-powermask-path-effect1426_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M -0.65000001,1.0999999 H 13.35 V 11.6 H -0.65000001 Z" />
       <g
          id="g1424"
          style="">
@@ -96,21 +63,24 @@
            width="3.4200001"
            height="0.30000001"
            x="8"
-           y="3" />
+           y="3"
+           d="m 8,3 h 3.42 V 3.3 H 8 Z" />
         <rect
            style="fill:#000000;stroke-width:0.211917;paint-order:markers fill stroke"
            id="rect1414"
            width="3.4200001"
            height="0.30000001"
            x="8"
-           y="3.5" />
+           y="3.5"
+           d="m 8,3.5 h 3.42 V 3.8 H 8 Z" />
         <rect
            style="fill:#000000;stroke-width:0.165668;paint-order:markers fill stroke"
            id="rect1416"
            width="2.0901213"
            height="0.30000001"
            x="8"
-           y="4" />
+           y="4"
+           d="m 8,4 h 2.090121 V 4.3 H 8 Z" />
         <g
            id="g1422"
            transform="translate(0.37425409,0.82359072)">
@@ -121,7 +91,8 @@
              height="0.60000002"
              x="0.12422053"
              y="3.3848631"
-             transform="rotate(22.288197)" />
+             transform="rotate(22.288197)"
+             d="M 0.12422053,3.3848631 H 8.1242205 V 3.9848632 H 0.12422053 Z" />
           <rect
              style="fill:#000000;stroke-width:0.280281;paint-order:markers fill stroke"
              id="rect1420"
@@ -129,123 +100,26 @@
              height="0.60000002"
              x="2.9901919"
              y="-8.5405416"
-             transform="matrix(0.92528787,-0.37926556,-0.37926556,-0.92528787,0,0)" />
+             transform="matrix(0.92528787,-0.37926556,-0.37926556,-0.92528787,0,0)"
+             d="m 2.9901919,-8.5405416 h 8.0000001 v 0.6 H 2.9901919 Z" />
         </g>
       </g>
     </mask>
     <filter
-       id="mask-powermask-path-effect1596_inverse"
+       id="mask-powermask-path-effect1426_inverse"
-       inkscape:label="filtermask-powermask-path-effect1596"
+       inkscape:label="filtermask-powermask-path-effect1426"
        style="color-interpolation-filters:sRGB"
        height="100"
        width="100"
        x="-50"
        y="-50">
       <feColorMatrix
-         id="mask-powermask-path-effect1596_primitive1"
+         id="mask-powermask-path-effect1426_primitive1"
          values="1"
          type="saturate"
          result="fbSourceGraphic" />
       <feColorMatrix
-         id="mask-powermask-path-effect1596_primitive2"
+         id="mask-powermask-path-effect1426_primitive2"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
-         in="fbSourceGraphic" />
-    </filter>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect2911">
-      <g
-         id="g2909"
-         style="">
-        <g
-           id="g2903"
-           transform="translate(0.0392767,0.898719)">
-          <path
-             style="fill:none;stroke:#000000;stroke-width:0.246849px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 2.0575721,3.0272162 6.3107233,5.7803674"
-             id="path2899" />
-          <path
-             style="display:inline;fill:none;stroke:#000000;stroke-width:0.246848px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 6.3107233,5.7803674 10.563875,3.0272158"
-             id="path2901" />
-        </g>
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.257994px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
-           d="M 6.9110499,6.3222782 9.653056,8.064284"
-           id="path2905" />
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.257994px;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1"
-           d="M 3.0469441,8.0642842 5.7889499,6.3222782"
-           id="path2907" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect4593">
-      <g
-         id="g4591"
-         style="display:inline;opacity:1">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.296715px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 1.8370382,3.1020348 5.6640803,5.861039"
-           id="path4583" />
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.296715px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 5.6640803,5.861039 9.4911222,3.1020348"
-           id="path4585" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 6.6208408,5.171288 9.4911224,7.2405413"
-           id="path4587" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 1.8370383,7.2405414 4.7073198,5.1712881"
-           id="path4589" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect1636">
-      <path
-         id="mask-powermask-path-effect1636_box"
-         style="fill:#ffffff;fill-opacity:1"
-         d="M 0.30833316,2.2057128 H 12.39567 V 11.218726 H 0.30833316 Z" />
-      <g
-         id="g1634"
-         style="display:inline;opacity:1">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1.6927236,3.5901471 6.3520016,8.249957"
-           id="path1626" />
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 6.3520016,8.249957 11.01128,3.5901471"
-           id="path1628" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 7.8895634,6.7122197 11.01128,9.8342921"
-           id="path1630" />
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1.6927232,9.8342917 4.8144398,6.7122197"
-           id="path1632" />
-      </g>
-    </mask>
-    <filter
-       id="mask-powermask-path-effect1636_inverse"
-       inkscape:label="filtermask-powermask-path-effect1636"
-       style="color-interpolation-filters:sRGB"
-       height="100"
-       width="100"
-       x="-50"
-       y="-50">
-      <feColorMatrix
-         id="mask-powermask-path-effect1636_primitive1"
-         values="1"
-         type="saturate"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="mask-powermask-path-effect1636_primitive2"
          values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
          in="fbSourceGraphic" />
     </filter>
@@ -254,33 +128,26 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     style="display:inline;opacity:1">
+     style="display:inline">
     <path
-       style="display:inline;fill:#000000;stroke-width:0.499999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
+       style="fill:#000000;stroke-width:0.268114;paint-order:markers fill stroke"
-       id="rect1371"
+       id="rect846"
-       width="10.087337"
+       width="12"
-       height="7.0130129"
+       height="8.5"
-       x="1.3083332"
+       x="0.34999999"
-       y="3.2057128"
+       y="2.0999999"
-       mask="url(#mask-powermask-path-effect1636)"
+       mask="url(#mask-powermask-path-effect1426)"
-       inkscape:path-effect="#path-effect1636"
+       inkscape:path-effect="#path-effect1426"
-       d="M 1.3083332,3.2057128 H 11.39567 V 10.218726 H 1.3083332 Z"
+       d="M 0.34999999,2.0999999 H 12.35 V 10.6 H 0.34999999 Z"
-       sodipodi:type="rect"
+       sodipodi:type="rect" />
-       transform="translate(-0.00200143,-0.36221924)" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Layer 2"
+     inkscape:label="Layer 2" />
-     style="display:inline" />
   <metadata
      id="metadata1469">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
@@ -290,6 +157,11 @@
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
     </rdf:RDF>
   </metadata>
 </svg>

themes/carbon/icons/system-log-out-symbolic.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16.014" height="16"><g color="#000" fill="#2e3436"><path d="M4 1s-.459-.014-.947.23C2.564 1.475 2 2.167 2 3v10c0 .833.564 1.525 1.053 1.77.488.244.947.23.947.23h8c.833 0 1.525-.564 1.77-1.053.244-.488.23-.947.23-.947v-2a1 1 0 10-2 0v2H4V3h8v2a1 1 0 102 0V3c0-.833-.564-1.525-1.053-1.77C12.46.986 12 1 12 1z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" font-weight="400" font-family="sans-serif" overflow="visible" fill-rule="evenodd"/><path d="M8.293 5.293L5.586 8l2.707 2.707 1.414-1.414L8.414 8l1.293-1.293z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" font-weight="400" font-family="sans-serif" overflow="visible"/><path d="M9 10h1v1H9zm0-5h1v1H9z" style="marker:none" overflow="visible"/><path d="M9 5c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1zm0 4c.554 0 1 .446 1 1s-.446 1-1 1-1-.446-1-1 .446-1 1-1z" style="marker:none" overflow="visible"/><path d="M8 7a1 1 0 100 2h7a1 1 0 100-2z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" font-weight="400" font-family="sans-serif" overflow="visible" fill-rule="evenodd"/></g></svg>

themes/carbon/icons/volume-high.svg

@@ -1,94 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-<svg
+  <style id="current-color-scheme" type="text/css">
-   viewBox="0 0 24 24"
-   width="24"
-   height="24"
-   version="1.1"
-   id="svg15"
-   sodipodi:docname="volume-high.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     id="namedview17"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="36.333333"
-     inkscape:cx="7.3486239"
-     inkscape:cy="14.009174"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg15">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1843" />
-  </sodipodi:namedview>
-  <style
-     id="current-color-scheme"
-     type="text/css">
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-  <metadata
+  <g transform="translate(1,1)">
-     id="metadata836">
+    <g class="ColorScheme-Text" fill="currentColor">
-    <rdf:RDF>
+      <path d="m14.324219 7.28125-.539063.8613281a4 4 0 0 1 1.214844 2.8574219 4 4 0 0 1 -1.210938 2.861328l.539063.863281a5 5 0 0 0 1.671875-3.724609 5 5 0 0 0 -1.675781-3.71875z"/>
-      <cc:Work
+      <path d="m13.865234 3.5371094-.24414.9765625a7 7 0 0 1 4.378906 6.4863281 7 7 0 0 1 -4.380859 6.478516l.24414.974609a8 8 0 0 0 5.136719-7.453125 8 8 0 0 0 -5.134766-7.4628906z"/>
-         rdf:about="">
+      <path d="m3 8h2v6h-2z" fill-rule="evenodd"/>
-        <cc:license
+      <path d="m6 14 5 5h1v-16h-1l-5 5z"/>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+    </g>
-      </cc:Work>
+  </g>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#000000;stroke-width:1.25363;stroke-linecap:round"
-     id="rect1759"
-     width="2.5168655"
-     height="6"
-     x="3.5091887"
-     y="9"
-     ry="0" />
-  <path
-     id="rect1761"
-     style="stroke-width:1.68567;stroke-linecap:round"
-     d="m 5.5091887,9 c 0,0 3.083097,-3.0474837 3,-3 h 1 v 12 h -1 l -3,-3 z"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-     d="m 11.509189,9 c 1.705024,2.504061 0.908166,4.308408 0,6"
-     id="path2855"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-     d="m 14.509189,7 c 2,3 2,7 0,10"
-     id="path3027"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-     d="m 17.509189,5 c 3,5 3,10 0,14"
-     id="path3614"
-     sodipodi:nodetypes="cc" />
 </svg>

themes/carbon/icons/volume-low.svg

@@ -1,94 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-<svg
+  <style id="current-color-scheme" type="text/css">
-   viewBox="0 0 24 24"
-   width="24"
-   height="24"
-   version="1.1"
-   id="svg15"
-   sodipodi:docname="volume-low.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     id="namedview17"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="36.333333"
-     inkscape:cx="7.3486239"
-     inkscape:cy="14.009174"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg15">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1843" />
-  </sodipodi:namedview>
-  <style
-     id="current-color-scheme"
-     type="text/css">
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-  <metadata
+  <g transform="translate(1,1)">
-     id="metadata836">
+    <g class="ColorScheme-Text" fill="currentColor">
-    <rdf:RDF>
+      <path d="m13.865234 3.5371094-.24414.9765625a7 7 0 0 1 4.378906 6.4863281 7 7 0 0 1 -4.380859 6.478516l.24414.974609a8 8 0 0 0 5.136719-7.453125 8 8 0 0 0 -5.134766-7.4628906zm.458985 3.7441406-.539063.8613281a4 4 0 0 1 1.214844 2.8574219 4 4 0 0 1 -1.210938 2.861328l.539063.863281a5 5 0 0 0 1.671875-3.724609 5 5 0 0 0 -1.675781-3.71875z" fill-opacity=".35"/>
-      <cc:Work
+      <path d="m3 8h2v6h-2z" fill-rule="evenodd"/>
-         rdf:about="">
+      <path d="m6 14 5 5h1v-16h-1l-5 5z"/>
-        <cc:license
+    </g>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+  </g>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#000000;stroke-width:1.25363;stroke-linecap:round"
-     id="rect1759"
-     width="2.5168655"
-     height="6"
-     x="3.5091887"
-     y="9"
-     ry="0" />
-  <path
-     id="rect1761"
-     style="stroke-width:1.68567;stroke-linecap:round"
-     d="m 5.5091887,9 c 0,0 3.083097,-3.0474837 3,-3 h 1 v 12 h -1 l -3,-3 z"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-     d="m 11.509189,9 c 1.705024,2.504061 0.908166,4.308408 0,6"
-     id="path2855"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.5"
-     d="m 14.509189,7 c 2,3 2,7 0,10"
-     id="path3027"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.5"
-     d="m 17.509189,5 c 3,5 3,10 0,14"
-     id="path3614"
-     sodipodi:nodetypes="cc" />
 </svg>

themes/carbon/icons/volume-medium.svg

@@ -1,94 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-<svg
+  <style id="current-color-scheme" type="text/css">
-   viewBox="0 0 24 24"
-   width="24"
-   height="24"
-   version="1.1"
-   id="svg15"
-   sodipodi:docname="volume-medium.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     id="namedview17"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="36.333333"
-     inkscape:cx="7.3486239"
-     inkscape:cy="14.009174"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg15">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1843" />
-  </sodipodi:namedview>
-  <style
-     id="current-color-scheme"
-     type="text/css">
         .ColorScheme-Text {
             color:#232629;
         }
     </style>
-  <metadata
+  <g transform="translate(1,1)">
-     id="metadata836">
+    <g class="ColorScheme-Text" fill="currentColor">
-    <rdf:RDF>
+      <path d="m14.324219 7.28125-.539063.8613281a4 4 0 0 1 1.214844 2.8574219 4 4 0 0 1 -1.210938 2.861328l.539063.863281a5 5 0 0 0 1.671875-3.724609 5 5 0 0 0 -1.675781-3.71875z"/>
-      <cc:Work
+      <path d="m13.865234 3.5371094-.24414.9765625a7 7 0 0 1 4.378906 6.4863281 7 7 0 0 1 -4.380859 6.478516l.24414.974609a8 8 0 0 0 5.136719-7.453125 8 8 0 0 0 -5.134766-7.4628906z" fill-opacity=".35"/>
-         rdf:about="">
+      <path d="m3.0000005 8h2v6h-2z" fill-rule="evenodd"/>
-        <cc:license
+      <path d="m6.0000005 14 5.0000005 5h.999999v-16h-1l-4.9999995 5z"/>
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+    </g>
-      </cc:Work>
+  </g>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#000000;stroke-width:1.25363;stroke-linecap:round"
-     id="rect1759"
-     width="2.5168655"
-     height="6"
-     x="3.5091887"
-     y="9"
-     ry="0" />
-  <path
-     id="rect1761"
-     style="stroke-width:1.68567;stroke-linecap:round"
-     d="m 5.5091887,9 c 0,0 3.083097,-3.0474837 3,-3 h 1 v 12 h -1 l -3,-3 z"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-     d="m 11.509189,9 c 1.705024,2.504061 0.908166,4.308408 0,6"
-     id="path2855"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-     d="m 14.509189,7 c 2,3 2,7 0,10"
-     id="path3027"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.5"
-     d="m 17.509189,5 c 3,5 3,10 0,14"
-     id="path3614"
-     sodipodi:nodetypes="cc" />
 </svg>

themes/carbon/icons/volume-muted.svg

@@ -1,94 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-<svg
+  <style id="current-color-scheme" type="text/css">
-   viewBox="0 0 24 24"
-   width="24"
-   height="24"
-   version="1.1"
-   id="svg15"
-   sodipodi:docname="volume-muted.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <defs
-     id="defs19" />
-  <sodipodi:namedview
-     id="namedview17"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="72.666667"
-     inkscape:cx="3.2752294"
-     inkscape:cy="12.412844"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg15">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1843" />
-  </sodipodi:namedview>
-  <style
-     id="current-color-scheme"
-     type="text/css">
         .ColorScheme-Text {
             color:#232629;
         }
+        .ColorScheme-NegativeText {
+            color:#da4453;
+        }
     </style>
-  <metadata
+  <g transform="translate(1,1)">
-     id="metadata836">
+    <g class="ColorScheme-Text" fill="currentColor">
-    <rdf:RDF>
+      <path d="m3 8v6h2v-6z"/>
-      <cc:Work
+      <path d="m6 8v6l5 5h1v-5z"/>
-         rdf:about="">
+      <path d="m11 3-3 3 4 4v-7z"/>
-        <cc:license
+      <g opacity=".35">
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <path d="m14.832031 16.832031a7 7 0 0 1 -1.21289.646485l.24414.974609a8 8 0 0 0 1.681641-.908203z"/>
-      </cc:Work>
+        <path d="m14.324219 7.28125-.539063.8613281a4 4 0 0 1 1.214844 2.8574219 4 4 0 0 1 -.371094 1.628906l.75.75a5 5 0 0 0 .621094-2.378906 5 5 0 0 0 -1.675781-3.71875z"/>
-      <cc:License
+        <path d="m13.865234 3.5371094-.24414.9765625a7 7 0 0 1 4.378906 6.4863281 7 7 0 0 1 -1.166016 3.833984l.716797.716797a8 8 0 0 0 1.449219-4.550781 8 8 0 0 0 -5.134766-7.4628906z"/>
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+      </g>
-        <cc:permits
+    </g>
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+    <path d="m-.50000006 4.7426407 1-.0000001v21.6274174h-1z" class="ColorScheme-NegativeText" fill="currentColor" transform="matrix(.70710678 -.70710678 .70710678 .70710678 0 0)"/>
-        <cc:permits
+  </g>
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:#000000;stroke-width:1.25363;stroke-linecap:round"
-     id="rect1759"
-     width="2.5168655"
-     height="6"
-     x="3.5091887"
-     y="9"
-     ry="0" />
-  <path
-     id="rect1761"
-     style="stroke-width:1.68567;stroke-linecap:round"
-     d="m 5.5091887,9 c 0,0 3.083097,-3.0474837 3,-3 h 1 v 12 h -1 l -3,-3 z"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.5"
-     d="m 11.509189,9 c 1.705024,2.504061 0.908166,4.308408 0,6"
-     id="path2855"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.5"
-     d="m 14.509189,7 c 2,3 2,7 0,10"
-     id="path3027"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.5"
-     d="m 17.509189,5 c 3,5 3,10 0,14"
-     id="path3614"
-     sodipodi:nodetypes="cc" />
 </svg>

themes/carbon/icons/warning.svg

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="48"
-   height="48"
-   viewBox="0 0 12.7 12.7"
-   version="1.1"
-   id="svg837"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   sodipodi:docname="warning.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview839"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="true"
-     units="px"
-     inkscape:zoom="12.429181"
-     inkscape:cx="22.205807"
-     inkscape:cy="27.113613"
-     inkscape:window-width="1866"
-     inkscape:window-height="1038"
-     inkscape:window-x="52"
-     inkscape:window-y="20"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid902" />
-  </sodipodi:namedview>
-  <defs
-     id="defs834">
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect2659"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect2659"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect1796"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect1796"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect1796">
-      <g
-         id="g1794"
-         transform="matrix(3.1496063,0,0,3.1496063,2.9999997,6.2500913)"
-         style="">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.972208;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 6.35,3.175 V 8.4666665"
-           id="path1790" />
-        <circle
-           style="opacity:1;fill:#000000;stroke:none;stroke-width:1.065;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-           id="circle1792"
-           cx="6.3499999"
-           cy="10.054167"
-           r="0.52916664" />
-      </g>
-    </mask>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect2659">
-      <path
-         id="mask-powermask-path-effect2659_box"
-         style="fill:#ffffff;fill-opacity:1"
-         d="M -0.70621928,-0.70618839 H 13.406219 V 13.40625 H -0.70621928 Z" />
-      <g
-         id="g2657"
-         style="">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:0.934071;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 6.3499999,3.175 V 8.4666667"
-           id="path2653" />
-        <circle
-           style="opacity:1;fill:#000000;stroke:none;stroke-width:1.065;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-           id="circle2655"
-           cx="6.3499999"
-           cy="10.163688"
-           r="0.52916664"
-           d="M 6.8791665,10.163688 A 0.52916664,0.52916664 0 0 1 6.3499999,10.692854 0.52916664,0.52916664 0 0 1 5.8208333,10.163688 0.52916664,0.52916664 0 0 1 6.3499999,9.6345211 0.52916664,0.52916664 0 0 1 6.8791665,10.163688 Z" />
-      </g>
-    </mask>
-    <filter
-       id="mask-powermask-path-effect2659_inverse"
-       inkscape:label="filtermask-powermask-path-effect2659"
-       style="color-interpolation-filters:sRGB"
-       height="100"
-       width="100"
-       x="-50"
-       y="-50">
-      <feColorMatrix
-         id="mask-powermask-path-effect2659_primitive1"
-         values="1"
-         type="saturate"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="mask-powermask-path-effect2659_primitive2"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
-         in="fbSourceGraphic" />
-    </filter>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="rect1016"
-       style="stroke-width:1;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers;stroke:#000000;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:1"
-       d="M 0.79374983,11.90625 6.3499999,0.79374983 11.90625,11.90625 Z"
-       sodipodi:nodetypes="cccc"
-       mask="url(#mask-powermask-path-effect2659)"
-       inkscape:path-effect="#path-effect2659"
-       inkscape:original-d="M 0.79374983,11.90625 6.3499999,0.79374983 11.90625,11.90625 Z" />
-  </g>
-</svg>

themes/carbon/menu.lua

@@ -0,0 +1,117 @@
+local temp = io.open(os.getenv("HOME").."/.config/awesome/file.lua","r")
+local filehelper = loadstring(temp:read("*a"))()
+temp:close()
+--get a giant list of xdg data
+log = function(...)
+	local params = {}
+	for k,v in pairs({...}) do
+		params[#params+1] = tostring(v)
+	end
+	local str = table.concat(params,"   ")
+	filehelper.write("./awesome_log",filehelper.read("./awesome_log").."\n"..str)
+end
+local function parse_xdg()
+	local output = {}
+	local temp = io.popen("find /usr/share/applications","r")
+	local file_table = temp:read("*a")
+	temp:close()
+	local temp = io.popen("find "..os.getenv("HOME").."/.local/share/applications","r")
+	file_table = file_table.."\n"..temp:read("*a")
+	temp:close()
+	local lines = {}
+	file_table:gsub("[^\n]+",function(capt) lines[#lines+1] = capt end)
+	for k,v in pairs(lines) do
+		local data = filehelper.read(v,"*a")
+		--check if its an app, if it has a name, and if it's even readable.
+		if data and data:match("Type=([^\n]+)") and data:match("Type=([^\n]+)") == "Application" and data:match("Name=([^\n]+)") then
+			--get the tags
+			local tags = data:match("Categories=([^\n]+)")
+			local categories = {}
+			if tags then
+				tags:gsub("[^;]+",function(capt) categories[#categories+1] = capt:match("%w+") end)
+			end
+			--remove a bunch of useless category extensions
+			while true do
+				local occurences = 0
+				local whitelist = {
+					Network = true,
+					Game = true,
+					Education = true,
+					Development = true,
+					Graphics = true,
+					Utility = true,
+					System = true,
+					AudioVideo = true,
+					Office = true,
+					Settings = true,
+				}
+				for k,v in pairs(categories) do
+					if not whitelist[v] then
+						table.remove(categories,k)
+						occurences = occurences + 1
+					end
+				end
+				if occurences == 0 then
+					break
+				end
+			end
+			--add this to the end so it'll be detected like a path.
+			categories[#categories+1]=data:match("Name=([^\n]+)")
+			output[#output+1] = {data:match("Exec=([^\n%%]+)"),categories = categories}
+		end
+	end
+	return output
+end
+
+--fuck
+local function sort_by_categories(input)
+	local output = {}
+	assert(type(input) == "table")
+	for k,v in pairs(input) do
+		local categories = v.categories
+		local function sort(tab,list,value)
+			local found = nil
+			for k,v in pairs(tab) do
+				if v[1] == list[1] then
+					found = v
+				end
+			end
+			if not found then
+				if list[2] then
+					tab[#tab+1] = {list[1],{}}
+					found = tab[#tab]
+				elseif list[1] then
+					tab[#tab+1] = {list[1],value}
+					found = tab[#tab]
+				end
+			end
+			if list[2] then
+				table.remove(list,1)
+				found[2] = sort(found[2],list,value)
+			end
+			return tab
+		end
+		output = sort(output,categories,v[1])
+	end
+	return output
+end
+
+local function sort_untagged(input)
+	local output = input
+	local other = {}
+	for k,v in pairs(input) do
+		log(k,v[1],v[2])
+		if type(v[2]) == "string" then
+			other[#other+1] = {v[1],v[2]}
+			output[k] = nil
+		end
+	end
+	local new_output = {}
+	for k,v in pairs(output) do
+		new_output[#new_output+1] = v
+	end
+	new_output[#new_output+1] = {"Other",other}
+	return new_output
+end
+
+return sort_untagged(sort_by_categories(parse_xdg()))

themes/carbon/theme.lua

@@ -1,40 +1,29 @@
--- Carbon: the reference theme
--- This theme is designed as a reference for working with AWMTK.
--- Comments will go into some detail about the features of AWMTK,
--- such as contexts, elements, and element prototypes.
-
---[[
-- Preface
-AWMTK is a library for building widget style contexts.
-Essentially, it's an easy way to separate styles for each individual
-widget by creating a "context" that contains variables for that 
-specific widget, which are set to fall back to the broader 
-definitions of these variables.
-
-Take as an example a specific variable definition:
-`theme.context_button_bg_normal`
-If this variable doesn't exist, it defaults to the broader variable 
-`theme.button_bg_normal`
-which itself defaults to an even broader variable
-`theme.bg_normal`
-That way, a theme can be as specific as possible without requiring
-]]
-
 local theme_assets = require("beautiful.theme_assets")
 local xresources = require("beautiful.xresources")
-local wibox = require("wibox")
 local dpi = xresources.apply_dpi
 
 local theme = {}
--- {{{ Color definitions
+
--- These variables define a fallback state for all widgets to use.
-theme.font = "sans 10"
 theme.name = "carbon"
 
-theme.bg_normal     = "#19191D"
+theme.font          = "Ubuntu Regular 9"
+theme.unitybar_width = dpi(55)
+theme.icon_rounding = 5
+theme.tasklist_button_shape_border_width = dpi(1)
+theme.tasklist_button_shape_border_color = "#262626AA"
+theme.launcher_button_shape_border_width = dpi(1)
+theme.launcher_button_shape_border_color = "#262626AA"
+theme.launcher_button_size = 44
+theme.tasklist_button_size = 44
+theme.macbar_rounding = 5
+theme.macbar_height = 45
+theme.menu_button_inner_margin = 2
+theme.container_rounding = 4
+theme.button_rounding = 4
+theme.bg_normal     = "#181819"
 theme.bg_focus      = "#3E3E3E"
-theme.bg_urgent     = "#5E5E5E" 
+theme.bg_urgent     = "#2E2E2E" 
-theme.bg_minimize   = "#5E5E5E" 
+theme.bg_minimize   = "#2E2E2E" 
 theme.bg_systray    = theme.bg_normal
 
 theme.fg_normal     = "#e1dec7"
@@ -47,12 +36,10 @@ theme.border_width  = dpi(1)
 theme.border_normal = theme.bg_normal
 theme.border_focus  = theme.bg_focus
 theme.border_marked = theme.bg_marked
--- include generic boilerplate
-theme = require("themes.generic")(theme)
 
--- }}}
+-- There are other variable sets
-
+-- overriding the default one when
--- All of the previous variables are still avaialable.
+-- defined, the sets are:
 -- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
 -- tasklist_[bg|fg]_[focus|urgent]
 -- titlebar_[bg|fg]_[normal|focus]
@@ -60,271 +47,29 @@ theme = require("themes.generic")(theme)
 -- mouse_finder_[color|timeout|animate_timeout|radius|factor]
 -- prompt_[fg|bg|fg_cursor|bg_cursor|font]
 -- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]
--- notification_font
+-- Example:
--- not1ification_[bg|fg]
+--theme.taglist_bg_focus = "#ff0000"
--- notification_[width|height|margin]
+theme.hotkeys_border_color = "#262626"
--- notification_[border_color|border_width|shape|opacity]
+theme.hotkeys_opacity = 0.2
--- etc.
-
-
--- {{{ Elements
---[[ 
-All AWMTK widgets have various elements with their own variables.
-These elements are essentially primitive UI components.
-The following elements are defined:
-- container
-- button
-- inputbox
-- textbox
-- icon
-The variables for these elements can be accessed in the form
-theme.{context}_{broader definition}
-i.e.
-theme.button_bg_normal ("button" is context, "bg_normal" is a broader
-definition)
-]]
-theme.button_bg_normal = theme.bg_normal
-theme.button_bg_focus = theme.bg_focus
-theme.button_bg_urgent = theme.bg_urgent
-theme.button_bg_marked = theme.bg_marked
---[[ ...etc
-In total, we can define the available primitive variables as such:
-[button|container|inputbox|textbox|icon]_...
-    ...[bg|fg|border]_[normal|focus|urgent|marked],
-    ...shape_border_[width|color],
-    ...inner_margin,
-    ...rounding
-These variables are pretty self descriptive, 
-
-Additionally, we have some variables for the container element:
-    container_spacing
-    container_spacing_vertical
-    container_spacing_horizontal
-These variables control the spacing of widgets in various layouts.
-
-]]
-
--- {{{ Bars
--- Sometimes objects require additional variables that don't fall under the
--- primitives model. For example, in this particular case, unitybar has a
--- "unitybar_bg" variable, which does not belong to any of the primitives but to
--- the bar itself. Ideally, all of the variables like these will be documented
--- in the widgets documentation.
--- All of the following variables do not belong to any primitive:
-theme.unitybar_bg = theme.bg_normal.."AA"
-theme.unitybar_border_color = theme.bg_normal
-theme.unitybar_width = dpi(50)
-theme.unitybar_inner_margin = 3
---Titlebars
-theme.titlebar_bg_normal = {
-    type = "linear",
-    from = {0,0},
-    to = {0,15},
-    stops = {
-        {0,theme.bg_normal},
-        {1,"#14141A"},
-    }
-}
 
 theme.titlebar_bg_focus = {
     type = "linear",
-    from = {0,0},
+    from = { 0, 15 },
-    to = {0,15},
+    to = { 0, 0 },
-    stops = {
+    stops = { { 0, "#3C3C3C"} , { 1 , "#424242"} }
-        {0,theme.bg_focus},
-        {1,"#333333"}
-    }
 }
 
--- Top bar 
+theme.titlebar_bg_normal = {
+    type = "linear",
+    from = { 0, 15 },
+    to = { 0, 0 },
+    stops = { { 0, "#161617"} , { 1 , "#222223"} }
+
+}
 theme.topbar_bg = theme.titlebar_bg_normal
--- }}}
+theme.titlebar_rounding = 6
 
--- {{{ Widgets
+-- Generate taglist squares:
-
---[[
-All of the widgets written in this config have contexts.
-A context essentially contains values for primitves that are specific
-to the widget. Think of the context as of a namespace but for that 
-particular widget's style variables.
-
-In practice, that means that defining
-`theme.menu_button_bg_normal` 
-will NOT affect
-`theme.button_bg_normal`
-and therefore all of the other instances derived from it, i.e.
-`theme.drawer_button_bg_normal`
-
-Do note however that if `theme.menu_button_bg_normal` is not defined,
-defining `theme.button_bg_normal` WILL affect it, as it is derived
-from `theme.button_bg_normal`
-
-An additional note should be made about the fact that these variables
-affect every instance of the widget, i.e. if you have a battery 
-widget in a wibar and another battery widget on the lock screen,
-both will be affected by the definiton of
-`theme.batter_container_bg_normal`. To change a particular widget's
-style properties, use the `style` table in its arguments table. (It should also be noted that `style` table has higher priority then theme variables)
-i.e. in .../awesome/core/layout.lua
-```
-require("widget.drawer")({ --This creates an instance of a widget
-    style = {
-        --This variable affects only this particular instance
-        button_bg_normal = "#FF00FF" 
-    }
-})
-```
-]]
-
---Example: defining menu properties
-theme.menu_submenu_icon = global.themes_dir..theme.name.."/submenu.png"
-theme.menu_height = dpi(18)
-theme.menu_width  = dpi(140)
---`button` is any clickable/hoverable element of the menu
-theme.menu_button_height = dpi(18)
-theme.menu_button_rounding = 5
-theme.menu_button_inner_margin = 2
---`container` is the background of the menu
-theme.menu_container_spacing = 4
-theme.menu_container_rounding = 5
---`icon` is any of the small power icons in the menu
---because `menu` applies generally to all of the menus,
---including the popup menus that appear when you click on an icon
---of the window, these particular icons have their own namespace.
---(to be completely honest i'm not exactly proud of how this works)
-theme.powercontrol_icon_rounding = 5
-
--- Calculate height/width of the button
-local button_size = theme.unitybar_width - theme.unitybar_inner_margin*2
-
--- All of the basic elements (container, button, icon, etc.) have a template. A
--- template defines the generic geometry properties of the given element. It's
--- possible to override these templates (even on a per-widget basis, as shown
--- here).
-
--- Disclaimer: This particular feature was mostly developed as an afterthought,
--- and it might change in the future to provide a more flexible approach to
--- handling events. Use at your own risk and only if you know what you're doing
--- or at the very least have some understanding of AwesomeWM's wibox library.
-
--- Example: this templates overrides the template of the container for all menus
--- in such a way that all of them will contain a gradient bar and a border
--- (awful.popup isn't capable of gradient borders, but using two backgroudnds
--- it's possible to make it work)
-theme.menu_container_widget = function(style)
-    return {
-        {
-            {
-                {
-                    { 
-                        {
-                            -- (weirdly enough i can't just set forced_height
-                            -- for the container itself.)
-                            {
-                                widget = wibox.widget.textbox,
-                                forced_height = 8
-                            },
-                            widget = wibox.container.background,
-                            bg = {
-                                type = "linear",
-                                from = {0,0},
-                                to = {0,8},
-                                stops = {
-                                    {0, theme.bg_focus},
-                                    {1, theme.bg_normal},
-                                }
-                            }
-                        },
-                        { 
-                            -- widget_container id indicates the widget which
-                            -- will be populated with the contents of the
-                            -- element (i.e. menu buttons, in this case)
-                            id = "widget_container",
-                            widget = wibox.container.margin,
-                            margins = style.container_inner_margin
-                        },
-                        layout = wibox.layout.fixed.vertical        
-                    },
-                    bg = style.container_bg_normal,
-                    widget = wibox.container.background,
-                },
-                layout = wibox.layout.fixed.vertical,
-            },
-            widget = wibox.container.margin,
-            margins = style.container_shape_border_width,
-        },
-        bg = style.container_shape_border_color,
-        widget = wibox.container.background,
-        shape = style.container_shape,
-        fg = style.container_fg_normal,
-        -- This id should indicate the part of the widget which should
-        -- change depending on certain events. Although this is useful for
-        -- buttons, it's completely useless for containers. This behaviour might
-        -- change in the future in favor of using callbacks instead of ids.
-        id = "widget_background"
-    }
-end
-
--- Note that even after modifying the template, all of the variables
--- are still usable (if you copied the template from the AWMTK library or made
--- your template compatible, of course)
-theme.menu_container_shape_border_width = dpi(1)
-theme.menu_container_shape_border_color = {
-    type = "linear",
-    from = {0,0},
-    to = {0,50},
-    stops = {
-        {0, "#3E3E3E"},
-        {1, "#1E1E1E"}
-    }
-}
--- Tasklist
-theme.tasklist_button_rounding = 4
--- These are defined as usual rather than using the awmtk style
-theme.tasklist_bg_normal = {
-    type = "linear",
-    from = {0,0},
-    to = {0,button_size},
-    stops = {
-        {0,"#18181F"},
-        {0.4,"#262626"},
-        {1,"#18181F"}
-    }
-}
-theme.tasklist_bg_focus = {
-    type = "linear",
-    from = {0,0},
-    to = {0,button_size},
-    stops = {
-        {0,"#363636"},
-        {0.4,"#424242"},
-        {1,"#363636"}
-    }
-}
-theme.tasklist_button_shape_border_color = {
-    type = "linear",
-    from = {0,0},
-    to = {0,button_size},
-    stops = {
-        {0,"#212124"},
-        {0.4,"#2E2E2E"},
-        {1,"#212124"}
-    }
-}
-theme.tasklist_button_shape_border_width = dpi(1)
-
--- Launcher
-theme.launcher_button_rounding = 4
-theme.launcher_button_bg_normal = theme.tasklist_bg_normal
-theme.launcher_button_bg_focus = theme.tasklist_bg_focus
-theme.launcher_button_bg_shape_border_color = theme.tasklist_button_bg_shape_border_color
-theme.launcher_button_bg_shape_border_width = dpi(1)
-
--- Hotkeys
-theme.hotkeys_border_color = "#262626"
-theme.hotkeys_opacity = 1
-
--- Taglist
 local taglist_square_size = dpi(4)
 theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
     taglist_square_size, theme.fg_normal
@@ -333,32 +78,25 @@ theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
     taglist_square_size, theme.fg_normal
 )
 
--- Wallpaper switcher
+-- Variables set for theming notifications:
-theme.wallpapers_button_rounding = 5
+-- notification_font
-theme.wallpapers_container_rounding = 5
+-- not1ification_[bg|fg]
-theme.wallpapers_icon_bg_normal = theme.topbar_bg
+-- notification_[width|height|margin]
-
+-- notification_[border_color|border_width|shape|opacity]
--- Notifications widget
-theme.mailbox_button_rounding = 5
-theme.mailbox_container_rounding = 5
-
--- Volume slider
-theme.volume_container_rounding = 5
-theme.volume_icon_bg_normal = theme.topbar_bg
-
--- Drawer
-theme.drawer_icon_bg_normal = theme.topbar_bg
-
--- Battery widget
-theme.battery_icon_bg_normal = theme.topbar_bg
-
--- Notifications
--- (these are untouched as of now and don't fall under AWMTK configuration model. this might change in the future)
 theme.notification_width = dpi(250)
 theme.notification_height = dpi(80)
--- }}}
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_submenu_icon = global.themes_dir..theme.name.."/submenu.png"
+theme.menu_height = dpi(18)
+theme.menu_width  = dpi(140)
+
+-- You can add as many variables as
+-- you wish and access them by using
+-- beautiful.variable in your rc.lua
+--theme.bg_widget = "#cc0000"
 
--- {{{ Icons
 -- Define the image to load
 theme.titlebar_close_button_normal = global.themes_dir..theme.name.."/titlebar/close_normal.png"
 theme.titlebar_close_button_focus  = global.themes_dir..theme.name.."/titlebar/close_focus.png"
@@ -405,18 +143,15 @@ theme.layout_cornernw = global.themes_dir..theme.name.."/layouts/cornernww.png"
 theme.layout_cornerne = global.themes_dir..theme.name.."/layouts/cornernew.png"
 theme.layout_cornersw = global.themes_dir..theme.name.."/layouts/cornersww.png"
 theme.layout_cornerse = global.themes_dir..theme.name.."/layouts/cornersew.png"
-theme_assets.recolor_layout(theme, theme.fg_normal)
-
-theme = require("themes.icons")(theme)
 
 -- Generate Awesome icon:
 theme.awesome_icon = theme_assets.awesome_icon(
     theme.menu_height, theme.bg_focus, theme.fg_focus
 )
+
 -- Define the icon theme for application icons. If not set then the icons
 -- from /usr/share/icons and /usr/share/icons/hicolor will be used.
 theme.icon_theme = "Adwaita"
--- }}}
 
 return theme
 

themes/generic.lua

@@ -1,26 +0,0 @@
---Shared code for include generic sizes for things
-local dpi = require("beautiful.xresources").apply_dpi
-return function(theme)
-    -- Notification size
-    theme.notification_width = dpi(250)
-    theme.notification_height = dpi(80)
-    theme.mailbox_container_width = dpi(260)
-    theme.mailbox_button_height = dpi(50)
-
-    -- Wallpaper widget sizes
-    theme.wallpapers_button_height = dpi(60)
-    theme.wallpapers_button_width = dpi(100)
-    theme.wallpapers_pager_container_spacing_vertical = dpi(5)
-    theme.wallpapers_pager_container_spacing_horizontal = dpi(5)
-    theme.wallpapers_pager_button_size = dpi(15)
-    
-    -- Menus
-    theme.menu_button_height = dpi(20)
-    theme.menu_button_width = dpi(140)
-    theme.menu_button_inner_margin = dpi(1)
-
-    -- Power management icons
-    theme.powercontrol_button_height = 25
-    theme.powercontrol_button_width = 25
-    return theme
-end

themes/icons.lua

@@ -1,60 +1,50 @@
--- Shared code for including icons
 -- Icons definitions for custom widgets
 local beautiful = require("beautiful")
 local beautiful_assets = require("beautiful").theme_assets
 local gears = require("gears")
-function beautiful.recolor_icon_group(tbl,write_to,regex,color)
+function beautiful.recolor_icon_group(tbl,regex,color)
     for k,v in pairs(tbl) do
         if k:match(regex) then
-            write_to[k] = gears.color.recolor_image(v,color)
+            beautiful[k] = gears.color.recolor_image(v,color)
         end
     end
 end
+-- Define dir to icons
 global.themes_dir = global.themes_dir or (os.getenv("HOME").."/.config/awesome/themes/")
-return function(theme)
+beautiful.name = beautiful.name or "default"
-    local temp = {}
+beautiful.icon_dir = beautiful.icon_dir or global.themes_dir..beautiful.name.."/icons/"
-    -- Define dir to icons
+local temp = {}
-    theme.icon_dir = theme.icon_dir or global.themes_dir..theme.name.."/icons/"
+-- Powermenu icons
-    -- Powermenu icons
+temp.powercontrol_icon_shutdown = beautiful.icon_dir.."shutdown.svg"
-    temp.powercontrol_icon_shutdown = theme.icon_dir.."shutdown.svg"
+temp.powercontrol_icon_suspend = beautiful.icon_dir.."suspend.svg"
-    temp.powercontrol_icon_suspend = theme.icon_dir.."suspend.svg"
+temp.powercontrol_icon_lock = beautiful.icon_dir.."lock.svg"
-    temp.powercontrol_icon_lock = theme.icon_dir.."lock.svg"
+beautiful.recolor_icon_group(temp,"^powercontrol_.+",beautiful.fg_normal)
-    beautiful.recolor_icon_group(temp,theme,"^powercontrol_.+",theme.fg_normal)
 
-    -- Volume icons
-    temp.volume_icon_high = theme.icon_dir.."volume-high.svg"
-    temp.volume_icon_medium = theme.icon_dir.."volume-medium.svg"
-    temp.volume_icon_low = theme.icon_dir.."volume-low.svg"
-    temp.volume_icon_muted = theme.icon_dir.."volume-muted.svg"
-    beautiful.recolor_icon_group(temp,theme,"^volume_.+",theme.fg_normal)
 
-    -- Battery icons
+-- Volume icons
-    temp.battery_caution_charging_symbolic = theme.icon_dir.."battery-caution-charging-symbolic.svg"
+temp.volume_icon_high = beautiful.icon_dir.."volume-high.svg"
-    temp.battery_caution_symbolic = theme.icon_dir.."battery-caution-symbolic.svg"
+temp.volume_icon_medium = beautiful.icon_dir.."volume-medium.svg"
-    temp.battery_empty_charging_symbolic = theme.icon_dir.."battery-empty-charging-symbolic.svg"
+temp.volume_icon_low = beautiful.icon_dir.."volume-low.svg"
-    temp.battery_empty_symbolic = theme.icon_dir.."battery-empty-symbolic.svg"
+temp.volume_icon_muted = beautiful.icon_dir.."volume-muted.svg"
-    temp.battery_full_charged_symbolic = theme.icon_dir.."battery-full-charged-symbolic.svg"
+beautiful.recolor_icon_group(temp,"^volume_.+",beautiful.fg_normal)
-    temp.battery_full_charging_symbolic = theme.icon_dir.."battery-full-charging-symbolic.svg"
-    temp.battery_full_symbolic = theme.icon_dir.."battery-full-symbolic.svg"
-    temp.battery_good_charging_symbolic = theme.icon_dir.."battery-good-charging-symbolic.svg"
-    temp.battery_good_symbolic = theme.icon_dir.."battery-good-symbolic.svg"
-    temp.battery_low_charging_symbolic = theme.icon_dir.."battery-low-charging-symbolic.svg"
-    temp.battery_low_symbolic = theme.icon_dir.."battery-low-symbolic.svg"
-    temp.battery_missing_symbolic = theme.icon_dir.."battery-missing-symbolic.svg"
-    beautiful.recolor_icon_group(temp,theme,"^battery_.+",theme.fg_normal)
 
-    -- Widget icons
+-- Battery icons
-    theme.wallpapers_icon = gears.color.recolor_image(theme.icon_dir.."wallpaper.svg",theme.fg_normal)
+temp.battery_caution_charging_symbolic = beautiful.icon_dir.."battery-caution-charging-symbolic.svg"
-    theme.mailbox_icon = gears.color.recolor_image(theme.icon_dir.."mail.svg",theme.fg_normal)
+temp.battery_caution_symbolic = beautiful.icon_dir.."battery-caution-symbolic.svg"
-    theme.username_logout_icon = gears.color.recolor_image(theme.icon_dir.."system-log-out-symbolic.svg",theme.fg_normal)
+temp.battery_empty_charging_symbolic = beautiful.icon_dir.."battery-empty-charging-symbolic.svg"
-    theme.drawer_open_icon = gears.color.recolor_image(theme.icon_dir.."drawer-open.svg",theme.fg_normal)
+temp.battery_empty_symbolic = beautiful.icon_dir.."battery-empty-symbolic.svg"
-    theme.drawer_closed_icon = gears.color.recolor_image(theme.icon_dir.."drawer-closed.svg",theme.fg_normal)
+temp.battery_full_charged_symbolic = beautiful.icon_dir.."battery-full-charged-symbolic.svg"
+temp.battery_full_charging_symbolic = beautiful.icon_dir.."battery-full-charging-symbolic.svg"
+temp.battery_full_symbolic = beautiful.icon_dir.."battery-full-symbolic.svg"
+temp.battery_good_charging_symbolic = beautiful.icon_dir.."battery-good-charging-symbolic.svg"
+temp.battery_good_symbolic = beautiful.icon_dir.."battery-good-symbolic.svg"
+temp.battery_low_charging_symbolic = beautiful.icon_dir.."battery-low-charging-symbolic.svg"
+temp.battery_low_symbolic = beautiful.icon_dir.."battery-low-symbolic.svg"
+temp.battery_missing_symbolic = beautiful.icon_dir.."battery-missing-symbolic.svg"
+beautiful.recolor_icon_group(temp,"^battery_.+",beautiful.fg_normal)
 
-    -- Generic icons
+-- Widget icons
-    theme.warning_icon = gears.color.recolor_image(theme.icon_dir.."warning.svg",theme.fg_normal)
+beautiful.wallpapers_icon = gears.color.recolor_image(beautiful.icon_dir.."wallpaper.svg",beautiful.fg_normal)
+beautiful.mailbox_icon = gears.color.recolor_image(beautiful.icon_dir.."mail.svg",beautiful.fg_normal)
+beautiful.username_logout_icon = gears.color.recolor_image(beautiful.icon_dir.."system-log-out-symbolic.svg",beautiful.fg_normal)
 
-    -- Fallback application icon
-    theme.fallback_icon = gears.surface(theme.icon_dir.."fallback-application.svg")
-
-    return theme
-end

themes/unity/icons/README.md

@@ -1,9 +1,7 @@
-lock/shutdown/suspend icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later)
+battery status icons, lock/shutdown/suspend icons, volume status icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later)
 
-the fallback-application.svg was taken from https://en.wikipedia.org/wiki/File:X.Org\_Logo.svg, distributed under the CC-BY-SA 3.0 license
+logout icon is taken from the adwaita project
 
-logout icon is taken from the adwaita project, licenses from https://gitlab.gnome.org/GNOME/adwaita-icon-theme apply.
+battery status icons in particular were modified to look somewhat less ugly when recolored to a single color. this was done because the config automatically recolors all icons to the color value of the foreground (text) color.
-
-all other icons should have the copyright and license attached to them as svg metadata.
 
 the author of this config does not claim copyright of any icons present in this folder unless stated otherwise in the icon's license metadata.

themes/unity/icons/battery-caution-charging-symbolic.svg

@@ -1,138 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+            .ColorScheme-PositiveText {
-   version="1.1"
+                color:#27ae60;
-   id="svg5"
+            }
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+        </style>
-   sodipodi:docname="battery-caution-charging-symbolic.svg"
+    </defs>
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M3 4l1 8H2V4zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/><path d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z" class="ColorScheme-PositiveText" fill="currentColor"/></svg>
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="8"
-     inkscape:cx="12.75"
-     inkscape:cy="8.375"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g952"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14673;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="0.71062315"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/unity/icons/battery-caution-symbolic.svg

@@ -1,123 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+        </style>
-   version="1.1"
+    </defs>
-   id="svg5"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M3 4l1 8H2V4zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/></svg>
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-caution-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="12.4375"
-     inkscape:cy="17.375"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g946"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-3"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <rect
-         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14673;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect3560"
-         width="0.71062315"
-         height="3.6072021"
-         x="1.843727"
-         y="4.5463986"
-         ry="0" />
-    </g>
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/unity/icons/battery-empty-charging-symbolic.svg

@@ -1,148 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+            .ColorScheme-PositiveText {
-   version="1.1"
+                color:#27ae60;
-   id="svg5"
+            }
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+        </style>
-   sodipodi:docname="battery-empty-charging-symbolic.svg"
+    </defs>
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/><path d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z" class="ColorScheme-PositiveText" fill="currentColor"/></svg>
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="16"
-     inkscape:cx="4.125"
-     inkscape:cy="22.625"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g1046"
-       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-         id="rect846"
-         width="8.0348587"
-         height="4.5357866"
-         x="1.3794135"
-         y="4.0821066"
-         sodipodi:type="rect"
-         ry="0.19166182"
-         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
-      <rect
-         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         id="rect2450-6"
-         width="0.71841258"
-         height="1.7797576"
-         x="9.4266291"
-         y="5.4601212"
-         ry="0.11856993" />
-      <g
-         id="g7225-0"
-         transform="translate(0.5386392,-0.2244544)"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="rect5668-9-3"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
-           sodipodi:nodetypes="cccc" />
-        <path
-           id="rect5668-9-4-0"
-           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>

themes/unity/icons/battery-empty-symbolic.svg

@@ -1,147 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+    <defs id="defs1">
-
+        <style type="text/css" id="current-color-scheme">
-<svg
+            .ColorScheme-NegativeText {
-   width="48"
+                color:#da4453;
-   height="48"
+            }
-   viewBox="0 0 12.7 12.7"
+        </style>
-   version="1.1"
+    </defs>
-   id="svg5"
+    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/></svg>
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   sodipodi:docname="battery-empty-symbolic.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     units="px"
-     inkscape:zoom="11.313709"
-     inkscape:cx="-19.533824"
-     inkscape:cy="17.677669"
-     inkscape:window-width="1856"
-     inkscape:window-height="1030"
-     inkscape:window-x="62"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <inkscape:path-effect
-       effect="powerclip"
-       id="path-effect5696"
-       is_visible="true"
-       lpeversion="1"
-       inverse="true"
-       flatten="false"
-       hide_clip="false"
-       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
-    <marker
-       style="overflow:visible"
-       id="Arrow1Lstart"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Lstart"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(12.5,0)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path2933" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="DotL"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="DotL"
-       inkscape:isstock="true">
-      <path
-         transform="scale(0.8) translate(7.4, 1)"
-         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
-         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
-         id="path1555" />
-    </marker>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5692">
-      <path
-         id="path5694"
-         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
-         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
-         sodipodi:nodetypes="ccccccc" />
-    </clipPath>
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask-powermask-path-effect2493">
-      <path
-         id="path2491"
-         style="color:#000000;fill:#000000;stroke-width:1;stroke-linecap:round;-inkscape-stroke:none"
-         d="m 4.0963908,4.8798054 a 0.1322915,0.1322915 0 0 0 -0.079065,0.038241 0.1322915,0.1322915 0 0 0 0,0.1855181 L 5.2642781,6.35 4.0173259,7.5959187 a 0.1322915,0.1322915 0 0 0 0,0.1870689 0.1322915,0.1322915 0 0 0 0.1875854,0 L 5.4508299,6.5365519 6.6972656,7.7829876 a 0.1322915,0.1322915 0 0 0 0.1855184,0 0.1322915,0.1322915 0 0 0 0,-0.1870689 L 5.6368654,6.35 6.882784,5.1035643 a 0.1322915,0.1322915 0 0 0 0,-0.1855181 0.1322915,0.1322915 0 0 0 -0.1855184,0 L 5.4508299,6.1639648 4.2049113,4.9180462 A 0.1322915,0.1322915 0 0 0 4.0963908,4.8798054 Z" />
-    </mask>
-    <inkscape:path-effect
-       effect="powermask"
-       id="path-effect2493"
-       is_visible="true"
-       lpeversion="1"
-       uri="#mask-powermask-path-effect2493"
-       invert="false"
-       hide_mask="false"
-       background="true"
-       background_color="#ffffffff" />
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="rect846"
-       width="9.6418304"
-       height="5.442944"
-       x="1.0906231"
-       y="3.6285279"
-       sodipodi:type="rect"
-       ry="0.22999418"
-       d="m 1.3206173,3.6285279 h 9.1818417 c 0.127417,0 0.229995,0.1025774 0.229995,0.2299942 v 4.9829557 c 0,0.1274167 -0.102578,0.2299941 -0.229995,0.2299941 H 1.3206173 c -0.1274168,0 -0.2299942,-0.1025774 -0.2299942,-0.2299941 V 3.8585221 c 0,-0.1274168 0.1025774,-0.2299942 0.2299942,-0.2299942 z" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:0.5568;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       id="rect2450-6"
-       width="0.86209512"
-       height="2.135709"
-       x="10.747282"
-       y="5.2821455"
-       ry="0.14228392" />
-  </g>
-  <metadata
-     id="metadata4105">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>