diff --git a/core/layout.lua b/core/layout.lua
index f5e782c..9cc1de1 100644
--- a/core/layout.lua
+++ b/core/layout.lua
@@ -55,6 +55,7 @@ awful.screen.connect_for_each_screen(function(s)
         bg = beautiful.topbar_bg
     })
     -- Add screen lock
+    require("widgets.lock")({screen = s, obscure = true})
     require("widgets.unitybar")(s,{
         top_widgets = {
             require("widgets.polytasklist")({
diff --git a/core/vars.lua b/core/vars.lua
index 7f2cb9f..d7bc1cb 100644
--- a/core/vars.lua
+++ b/core/vars.lua
@@ -4,6 +4,7 @@ local gears = require("gears")
 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/unity2/theme.lua"
 global.terminal = "xterm"
 global.editor = os.getenv("EDITOR") or "vim"
diff --git a/libs/thumbnail.lua b/libs/thumbnail.lua
new file mode 100644
index 0000000..fdc792c
--- /dev/null
+++ b/libs/thumbnail.lua
@@ -0,0 +1,21 @@
+-- A small utility function to generate thumbnails for images
+local spawn = require("awful.spawn")
+local thumbnailer = {}
+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")
+    if os.execute("ls "..path) ~= 0 then
+        return false, "unable to access image directory"
+    end
+    if os.execute("ls "..thumb_path) == 0 then  
+        return true
+    end
+    if os.execute("mkdir "..thumb_path) ~= 0 then
+        return false, "unable to create thumbnail directory"
+    end
+    spawn("mogrify -thumbnail x"..tostring(height).." -path '"..thumb_path.."' '"..path.."'/*.{jpg,png}")
+    return true
+end
+
+return thumbnailer
diff --git a/rc.lua b/rc.lua
index 3604f35..ca08770 100644
--- a/rc.lua
+++ b/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")
@@ -41,4 +42,4 @@ end)
 
 require("custom_binds")
 require("awesomerc")
-require("powerman")
+--require("powerman")
diff --git a/themes/icons.lua b/themes/icons.lua
new file mode 100644
index 0000000..e1b1a74
--- /dev/null
+++ b/themes/icons.lua
@@ -0,0 +1,55 @@
+-- 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,regex,color)
+    for k,v in pairs(tbl) do
+        if k:match(regex) then
+            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/")
+beautiful.name = beautiful.name or "default"
+beautiful.icon_dir = beautiful.icon_dir or global.themes_dir..beautiful.name.."/icons/"
+print(beautiful.icon_dir)
+-- Recolor icons
+beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_normal,"normal")
+beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_focus,"focus")
+beautiful_assets.recolor_layout(beautiful,beautiful.fg_normal)
+local temp = {}
+-- Powermenu icons
+temp.powercontrol_icon_shutdown = beautiful.icon_dir.."shutdown.svg"
+temp.powercontrol_icon_suspend = beautiful.icon_dir.."suspend.svg"
+temp.powercontrol_icon_lock = beautiful.icon_dir.."lock.svg"
+beautiful.recolor_icon_group(temp,"^powercontrol_.+",beautiful.fg_normal)
+
+
+-- Volume icons
+temp.volume_icon_high = beautiful.icon_dir.."volume-high.svg"
+temp.volume_icon_medium = beautiful.icon_dir.."volume-medium.svg"
+temp.volume_icon_low = beautiful.icon_dir.."volume-low.svg"
+temp.volume_icon_muted = beautiful.icon_dir.."volume-muted.svg"
+beautiful.recolor_icon_group(temp,"^volume_.+",beautiful.fg_normal)
+
+-- Battery icons
+temp.battery_caution_charging_symbolic = beautiful.icon_dir.."battery-caution-charging-symbolic.svg"
+temp.battery_caution_symbolic = beautiful.icon_dir.."battery-caution-symbolic.svg"
+temp.battery_empty_charging_symbolic = beautiful.icon_dir.."battery-empty-charging-symbolic.svg"
+temp.battery_empty_symbolic = beautiful.icon_dir.."battery-empty-symbolic.svg"
+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)
+
+-- Widget icons
+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)
+
+
diff --git a/themes/redmond98/assets/redmond98borders.svg b/themes/redmond98/assets/redmond98borders.svg
deleted file mode 100644
index 0d8530d..0000000
--- a/themes/redmond98/assets/redmond98borders.svg
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100mm"
-   height="100mm"
-   viewBox="0 0 100 100"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="redmond98borders.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">
-  <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"
-     inkscape:zoom="2.057805"
-     inkscape:cx="174.21476"
-     inkscape:cy="197.78356"
-     inkscape:window-width="1861"
-     inkscape:window-height="1036"
-     inkscape:window-x="57"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3" />
-  <defs
-     id="defs2">
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter1980"
-       x="0"
-       y="0"
-       width="1.01"
-       height="1.01">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1970" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1972" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0"
-         result="blur"
-         id="feGaussianBlur1974" />
-      <feOffset
-         dx="0.5"
-         dy="0.5"
-         result="offset"
-         id="feOffset1976" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="fbSourceGraphic"
-         id="feComposite1978" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix2000" />
-      <feFlood
-         id="feFlood2002"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite2004"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur2006"
-         in="composite1"
-         stdDeviation="0"
-         result="blur" />
-      <feOffset
-         id="feOffset2008"
-         dx="0.5"
-         dy="0.5"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite2010"
-         in="fbSourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow"
-       id="filter1980-6"
-       x="0"
-       y="0"
-       width="1.01"
-       height="1.01">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood1970-7" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite1972-5" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0"
-         result="blur"
-         id="feGaussianBlur1974-3" />
-      <feOffset
-         dx="0.5"
-         dy="0.5"
-         result="offset"
-         id="feOffset1976-5" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="fbSourceGraphic"
-         id="feComposite1978-6" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix2000-2" />
-      <feFlood
-         id="feFlood2002-9"
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite2004-1"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur2006-2"
-         in="composite1"
-         stdDeviation="0"
-         result="blur" />
-      <feOffset
-         id="feOffset2008-7"
-         dx="0.5"
-         dy="0.5"
-         result="offset" />
-      <feComposite
-         in2="offset"
-         id="feComposite2010-0"
-         in="fbSourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-  </defs>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Layer 3">
-    <rect
-       style="fill:#c2c6ca;fill-opacity:1;stroke:none;stroke-width:0.264584;paint-order:markers fill stroke"
-       id="rect31-3"
-       width="100"
-       height="100"
-       x="0"
-       y="0" />
-    <rect
-       style="fill:#efefef;fill-opacity:1;stroke:none;stroke-width:0.264584;paint-order:markers fill stroke;filter:url(#filter1980)"
-       id="rect31-3-3"
-       width="100"
-       height="100"
-       x="0"
-       y="0"
-       transform="scale(0.99501243,0.99502488)" />
-  </g>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2" />
-</svg>
diff --git a/themes/redmond98/assets/win98bordersv1.svg b/themes/redmond98/assets/win98bordersv1.svg
deleted file mode 100644
index 57d674b..0000000
--- a/themes/redmond98/assets/win98bordersv1.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100mm"
-   height="100mm"
-   viewBox="0 0 100 100"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="win98bordersv1.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">
-  <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"
-     inkscape:zoom="1.4550879"
-     inkscape:cx="13.401253"
-     inkscape:cy="118.20592"
-     inkscape:window-width="1861"
-     inkscape:window-height="1036"
-     inkscape:window-x="57"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Layer 3">
-    <rect
-       style="fill:#dcdcdc;fill-opacity:1;stroke:none;stroke-width:0.263886;paint-order:markers fill stroke"
-       id="rect31-3"
-       width="99.736115"
-       height="99.736115"
-       x="0.13194287"
-       y="0.13194287" />
-    <path
-       id="rect31-3-6"
-       style="fill:#646565;fill-opacity:1;stroke:none;stroke-width:0.263886;paint-order:markers fill stroke"
-       d="M 99.868057,0.13194125 V 99.868057 H 0.13194289 Z"
-       sodipodi:nodetypes="cccc" />
-  </g>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="rect31"
-       style="opacity:1;fill:#646565;stroke:none;stroke-width:0.263886;paint-order:markers fill stroke;fill-opacity:1"
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="0"
-       inkscape:original="M 0.1328125 0.1328125 L 0.1328125 99.867188 L 99.867188 99.867188 L 99.867188 0.1328125 L 0.1328125 0.1328125 z "
-       d="M 0.1328125,0.1328125 V 99.867188 H 99.867188 V 0.1328125 Z"
-       transform="matrix(1.0026633,0,0,1.0026633,-0.13316622,-0.13316622)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2" />
-</svg>
diff --git a/themes/redmond98/assets/win98bordersv1layer2.svg b/themes/redmond98/assets/win98bordersv1layer2.svg
deleted file mode 100644
index 315b4a1..0000000
--- a/themes/redmond98/assets/win98bordersv1layer2.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="100mm"
-   height="100mm"
-   viewBox="0 0 100 100"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="win98bordersv1layer2.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">
-  <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"
-     inkscape:zoom="2.057805"
-     inkscape:cx="178.58835"
-     inkscape:cy="243.94926"
-     inkscape:window-width="1861"
-     inkscape:window-height="1036"
-     inkscape:window-x="57"
-     inkscape:window-y="21"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Layer 3">
-    <rect
-       style="fill:#dcdcdc;fill-opacity:1;stroke:none;stroke-width:0.263886;paint-order:markers fill stroke"
-       id="rect31-3"
-       width="99.736115"
-       height="99.736115"
-       x="0.13194287"
-       y="0.13194287" />
-    <path
-       id="rect31-3-6"
-       style="fill:#646565;fill-opacity:1;stroke:none;stroke-width:0.263886;paint-order:markers fill stroke"
-       d="M 99.868057,0.13194125 V 99.868057 H 0.13194289 Z"
-       sodipodi:nodetypes="cccc" />
-  </g>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="rect31"
-       style="opacity:1;fill:#747575;stroke:none;stroke-width:0.263886;paint-order:markers fill stroke;fill-opacity:1"
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="0"
-       inkscape:original="M 0.1328125 0.1328125 L 0.1328125 99.867188 L 99.867188 99.867188 L 99.867188 0.1328125 L 0.1328125 0.1328125 z "
-       d="M 0.1328125,0.1328125 V 99.867188 H 99.867188 V 0.1328125 Z"
-       transform="matrix(1.0026633,0,0,1.0026633,-0.13316622,-0.13316622)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2" />
-</svg>
diff --git a/themes/redmond98/icons/battery-caution-charging-symbolic.svg b/themes/redmond98/icons/battery-caution-charging-symbolic.svg
deleted file mode 100644
index 56fe444..0000000
--- a/themes/redmond98/icons/battery-caution-charging-symbolic.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-    </defs>
-    <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>
diff --git a/themes/redmond98/icons/battery-caution-symbolic.svg b/themes/redmond98/icons/battery-caution-symbolic.svg
deleted file mode 100644
index 3fb7d4a..0000000
--- a/themes/redmond98/icons/battery-caution-symbolic.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-        </style>
-    </defs>
-    <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>
diff --git a/themes/redmond98/icons/battery-empty-charging-symbolic.svg b/themes/redmond98/icons/battery-empty-charging-symbolic.svg
deleted file mode 100644
index e3e8620..0000000
--- a/themes/redmond98/icons/battery-empty-charging-symbolic.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-    </defs>
-    <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>
diff --git a/themes/redmond98/icons/battery-empty-symbolic.svg b/themes/redmond98/icons/battery-empty-symbolic.svg
deleted file mode 100644
index 710c02b..0000000
--- a/themes/redmond98/icons/battery-empty-symbolic.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-        </style>
-    </defs>
-    <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>
diff --git a/themes/redmond98/icons/battery-full-charged-symbolic.svg b/themes/redmond98/icons/battery-full-charged-symbolic.svg
deleted file mode 100644
index ae88a8c..0000000
--- a/themes/redmond98/icons/battery-full-charged-symbolic.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg2037"
-   sodipodi:docname="battery-full-charged-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata2041">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-full-charging-symbolic.svg b/themes/redmond98/icons/battery-full-charging-symbolic.svg
deleted file mode 100644
index 2db325e..0000000
--- a/themes/redmond98/icons/battery-full-charging-symbolic.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg942"
-   sodipodi:docname="battery-full-charging-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata946">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-full-symbolic.svg b/themes/redmond98/icons/battery-full-symbolic.svg
deleted file mode 100644
index 7daa418..0000000
--- a/themes/redmond98/icons/battery-full-symbolic.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg1375"
-   sodipodi:docname="battery-full-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata1379">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-good-charging-symbolic.svg b/themes/redmond98/icons/battery-good-charging-symbolic.svg
deleted file mode 100644
index 0b54f56..0000000
--- a/themes/redmond98/icons/battery-good-charging-symbolic.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg1149"
-   sodipodi:docname="battery-good-charging-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata1153">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-good-symbolic.svg b/themes/redmond98/icons/battery-good-symbolic.svg
deleted file mode 100644
index b55a8e0..0000000
--- a/themes/redmond98/icons/battery-good-symbolic.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg2062"
-   sodipodi:docname="battery-good-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata2066">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-low-charging-symbolic.svg b/themes/redmond98/icons/battery-low-charging-symbolic.svg
deleted file mode 100644
index 56fb9cc..0000000
--- a/themes/redmond98/icons/battery-low-charging-symbolic.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg186"
-   sodipodi:docname="battery-low-charging-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata190">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-low-symbolic.svg b/themes/redmond98/icons/battery-low-symbolic.svg
deleted file mode 100644
index ab50fc2..0000000
--- a/themes/redmond98/icons/battery-low-symbolic.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg2762"
-   sodipodi:docname="battery-low-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata2766">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/battery-missing-symbolic.svg b/themes/redmond98/icons/battery-missing-symbolic.svg
deleted file mode 100644
index f96c4b2..0000000
--- a/themes/redmond98/icons/battery-missing-symbolic.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
-   version="1.1"
-   id="svg258"
-   sodipodi:docname="battery-missing-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
-  <metadata
-     id="metadata262">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </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>
diff --git a/themes/redmond98/icons/lock.svg b/themes/redmond98/icons/lock.svg
deleted file mode 100644
index 974b65c..0000000
--- a/themes/redmond98/icons/lock.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <defs id="defs3051">
-    <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#232629;
-      }
-      </style>
-  </defs>
-  <g transform="translate(1,1)">
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 11 3 C 6.568 3 3 6.568 3 11 C 3 15.432 6.568 19 11 19 C 15.432 19 19 15.432 19 11 C 19 6.568 15.432 3 11 3 z M 11 4 C 14.878 4 18 7.122 18 11 C 18 14.878 14.878 18 11 18 C 7.122 18 4 14.878 4 11 C 4 7.122 7.122 4 11 4 z M 11 6 A 2.0000021 2.0000014 0 0 0 9 8 L 9 10 L 7 10 L 7 15 L 15 15 L 15 10 L 13 10 L 13 8 A 2.0000021 2.0000014 0 0 0 11 6 z M 11 7 A 1 1 0 0 1 12 8 L 12 10 L 10 10 L 10 8 A 1 1 0 0 1 11 7 z M 8 11 L 9 11 L 10 11 L 12 11 L 13 11 L 14 11 L 14 14 L 8 14 L 8 11 z " class="ColorScheme-Text"/>
-  </g>
-</svg>
diff --git a/themes/redmond98/icons/shutdown.svg b/themes/redmond98/icons/shutdown.svg
deleted file mode 100644
index affd2a5..0000000
--- a/themes/redmond98/icons/shutdown.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <defs id="defs3051">
-    <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#232629;
-      }
-      </style>
-  </defs>
-  <g transform="translate(1,1)">
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" d="M 10 3 L 10 10 L 12 10 L 12 3 L 10 3 z M 9 3.265625 C 5.5444518 4.1502188 3 7.2610109 3 11 C 3 15.432 6.568 19 11 19 C 15.432 19 19 15.432 19 11 C 19 7.2610109 16.455548 4.1502188 13 3.265625 L 13 4.3027344 C 15.895041 5.15992 18 7.819625 18 11 C 18 14.878 14.878 18 11 18 C 7.122 18 4 14.878 4 11 C 4 7.819625 6.1049587 5.15992 9 4.3027344 L 9 3.265625 z " class="ColorScheme-Text"/>
-  </g>
-</svg>
diff --git a/themes/redmond98/icons/suspend.svg b/themes/redmond98/icons/suspend.svg
deleted file mode 100644
index d64205d..0000000
--- a/themes/redmond98/icons/suspend.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <style type="text/css" id="current-color-scheme">
-        .ColorScheme-Text {
-            color:#232629;
-        }
-    </style>
-  <g transform="translate(1,1)">
-    <g class="ColorScheme-Text" fill="currentColor">
-      <path d="M7.047 4.049A7.995 8 0 0 0 3 11a7.995 8 0 0 0 7.994 8 7.995 8 0 0 0 6.938-4.043 7.995 8 0 0 0 .01-.006l-.739-.738a6.996 7 0 0 1-.004.006 6.996 7 0 0 1-3.207.781 6.996 7 0 0 1-6.994-7 6.996 7 0 0 1 .785-3.213zM6.303 5.82A7.995 8 0 0 0 5.998 8a7.995 8 0 0 0 7.994 8 7.995 8 0 0 0 2.188-.313A6.996 7 0 0 1 10.994 18 6.996 7 0 0 1 4 11a6.996 7 0 0 1 2.303-5.18z"/>
-      <path d="M10 6v1h2.293l-2 2-.293.293V10h4V9h-2.293l2-2L14 6.707V6h-.707zm5-3v1h2.293l-2 2-.293.293V7h4V6h-2.293l2-2L19 3.707V3h-.707z"/>
-    </g>
-  </g>
-</svg>
diff --git a/themes/redmond98/icons/volume-high.svg b/themes/redmond98/icons/volume-high.svg
deleted file mode 100644
index 486ec0b..0000000
--- a/themes/redmond98/icons/volume-high.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <style id="current-color-scheme" type="text/css">
-        .ColorScheme-Text {
-            color:#232629;
-        }
-    </style>
-  <g transform="translate(1,1)">
-    <g class="ColorScheme-Text" fill="currentColor">
-      <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"/>
-      <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"/>
-      <path d="m3 8h2v6h-2z" fill-rule="evenodd"/>
-      <path d="m6 14 5 5h1v-16h-1l-5 5z"/>
-    </g>
-  </g>
-</svg>
diff --git a/themes/redmond98/icons/volume-low.svg b/themes/redmond98/icons/volume-low.svg
deleted file mode 100644
index 824a3f6..0000000
--- a/themes/redmond98/icons/volume-low.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <style id="current-color-scheme" type="text/css">
-        .ColorScheme-Text {
-            color:#232629;
-        }
-    </style>
-  <g transform="translate(1,1)">
-    <g class="ColorScheme-Text" fill="currentColor">
-      <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"/>
-      <path d="m3 8h2v6h-2z" fill-rule="evenodd"/>
-      <path d="m6 14 5 5h1v-16h-1l-5 5z"/>
-    </g>
-  </g>
-</svg>
diff --git a/themes/redmond98/icons/volume-medium.svg b/themes/redmond98/icons/volume-medium.svg
deleted file mode 100644
index 5e6dd1f..0000000
--- a/themes/redmond98/icons/volume-medium.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <style id="current-color-scheme" type="text/css">
-        .ColorScheme-Text {
-            color:#232629;
-        }
-    </style>
-  <g transform="translate(1,1)">
-    <g class="ColorScheme-Text" fill="currentColor">
-      <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"/>
-      <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"/>
-      <path d="m3.0000005 8h2v6h-2z" fill-rule="evenodd"/>
-      <path d="m6.0000005 14 5.0000005 5h.999999v-16h-1l-4.9999995 5z"/>
-    </g>
-  </g>
-</svg>
diff --git a/themes/redmond98/icons/volume-muted.svg b/themes/redmond98/icons/volume-muted.svg
deleted file mode 100644
index bf8f17a..0000000
--- a/themes/redmond98/icons/volume-muted.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <style id="current-color-scheme" type="text/css">
-        .ColorScheme-Text {
-            color:#232629;
-        }
-        .ColorScheme-NegativeText {
-            color:#da4453;
-        }
-    </style>
-  <g transform="translate(1,1)">
-    <g class="ColorScheme-Text" fill="currentColor">
-      <path d="m3 8v6h2v-6z"/>
-      <path d="m6 8v6l5 5h1v-5z"/>
-      <path d="m11 3-3 3 4 4v-7z"/>
-      <g opacity=".35">
-        <path d="m14.832031 16.832031a7 7 0 0 1 -1.21289.646485l.24414.974609a8 8 0 0 0 1.681641-.908203z"/>
-        <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"/>
-        <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"/>
-      </g>
-    </g>
-    <path d="m-.50000006 4.7426407 1-.0000001v21.6274174h-1z" class="ColorScheme-NegativeText" fill="currentColor" transform="matrix(.70710678 -.70710678 .70710678 .70710678 0 0)"/>
-  </g>
-</svg>
diff --git a/themes/redmond98/layouts/cornerne.png b/themes/redmond98/layouts/cornerne.png
deleted file mode 100644
index c85bd56..0000000
Binary files a/themes/redmond98/layouts/cornerne.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornernew.png b/themes/redmond98/layouts/cornernew.png
deleted file mode 100644
index c3fd986..0000000
Binary files a/themes/redmond98/layouts/cornernew.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornernw.png b/themes/redmond98/layouts/cornernw.png
deleted file mode 100644
index dfe78b3..0000000
Binary files a/themes/redmond98/layouts/cornernw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornernww.png b/themes/redmond98/layouts/cornernww.png
deleted file mode 100644
index f489010..0000000
Binary files a/themes/redmond98/layouts/cornernww.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornerse.png b/themes/redmond98/layouts/cornerse.png
deleted file mode 100644
index 023ae79..0000000
Binary files a/themes/redmond98/layouts/cornerse.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornersew.png b/themes/redmond98/layouts/cornersew.png
deleted file mode 100644
index f7cfa1c..0000000
Binary files a/themes/redmond98/layouts/cornersew.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornersw.png b/themes/redmond98/layouts/cornersw.png
deleted file mode 100644
index c1453c9..0000000
Binary files a/themes/redmond98/layouts/cornersw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/cornersww.png b/themes/redmond98/layouts/cornersww.png
deleted file mode 100644
index a65a043..0000000
Binary files a/themes/redmond98/layouts/cornersww.png and /dev/null differ
diff --git a/themes/redmond98/layouts/dwindle.png b/themes/redmond98/layouts/dwindle.png
deleted file mode 100644
index 9902d22..0000000
Binary files a/themes/redmond98/layouts/dwindle.png and /dev/null differ
diff --git a/themes/redmond98/layouts/dwindlew.png b/themes/redmond98/layouts/dwindlew.png
deleted file mode 100644
index 9199049..0000000
Binary files a/themes/redmond98/layouts/dwindlew.png and /dev/null differ
diff --git a/themes/redmond98/layouts/fairh.png b/themes/redmond98/layouts/fairh.png
deleted file mode 100644
index d41deea..0000000
Binary files a/themes/redmond98/layouts/fairh.png and /dev/null differ
diff --git a/themes/redmond98/layouts/fairhw.png b/themes/redmond98/layouts/fairhw.png
deleted file mode 100644
index bb50e3a..0000000
Binary files a/themes/redmond98/layouts/fairhw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/fairv.png b/themes/redmond98/layouts/fairv.png
deleted file mode 100644
index f5f0288..0000000
Binary files a/themes/redmond98/layouts/fairv.png and /dev/null differ
diff --git a/themes/redmond98/layouts/fairvw.png b/themes/redmond98/layouts/fairvw.png
deleted file mode 100644
index 4f4ed52..0000000
Binary files a/themes/redmond98/layouts/fairvw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/floating.png b/themes/redmond98/layouts/floating.png
deleted file mode 100644
index b8061a0..0000000
Binary files a/themes/redmond98/layouts/floating.png and /dev/null differ
diff --git a/themes/redmond98/layouts/floatingw.png b/themes/redmond98/layouts/floatingw.png
deleted file mode 100644
index 4815894..0000000
Binary files a/themes/redmond98/layouts/floatingw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/fullscreen.png b/themes/redmond98/layouts/fullscreen.png
deleted file mode 100644
index d02f6fc..0000000
Binary files a/themes/redmond98/layouts/fullscreen.png and /dev/null differ
diff --git a/themes/redmond98/layouts/fullscreenw.png b/themes/redmond98/layouts/fullscreenw.png
deleted file mode 100644
index 5c35bfa..0000000
Binary files a/themes/redmond98/layouts/fullscreenw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/magnifier.png b/themes/redmond98/layouts/magnifier.png
deleted file mode 100644
index 2925414..0000000
Binary files a/themes/redmond98/layouts/magnifier.png and /dev/null differ
diff --git a/themes/redmond98/layouts/magnifierw.png b/themes/redmond98/layouts/magnifierw.png
deleted file mode 100644
index 6209556..0000000
Binary files a/themes/redmond98/layouts/magnifierw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/max.png b/themes/redmond98/layouts/max.png
deleted file mode 100644
index 8d20844..0000000
Binary files a/themes/redmond98/layouts/max.png and /dev/null differ
diff --git a/themes/redmond98/layouts/maxw.png b/themes/redmond98/layouts/maxw.png
deleted file mode 100644
index 85f5ce3..0000000
Binary files a/themes/redmond98/layouts/maxw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/spiral.png b/themes/redmond98/layouts/spiral.png
deleted file mode 100644
index d9434be..0000000
Binary files a/themes/redmond98/layouts/spiral.png and /dev/null differ
diff --git a/themes/redmond98/layouts/spiralw.png b/themes/redmond98/layouts/spiralw.png
deleted file mode 100644
index b78dd86..0000000
Binary files a/themes/redmond98/layouts/spiralw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tile.png b/themes/redmond98/layouts/tile.png
deleted file mode 100644
index 3ede21e..0000000
Binary files a/themes/redmond98/layouts/tile.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tilebottom.png b/themes/redmond98/layouts/tilebottom.png
deleted file mode 100644
index 6f8c257..0000000
Binary files a/themes/redmond98/layouts/tilebottom.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tilebottomw.png b/themes/redmond98/layouts/tilebottomw.png
deleted file mode 100644
index a1de7b2..0000000
Binary files a/themes/redmond98/layouts/tilebottomw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tileleft.png b/themes/redmond98/layouts/tileleft.png
deleted file mode 100644
index 31d6870..0000000
Binary files a/themes/redmond98/layouts/tileleft.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tileleftw.png b/themes/redmond98/layouts/tileleftw.png
deleted file mode 100644
index cf14c25..0000000
Binary files a/themes/redmond98/layouts/tileleftw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tiletop.png b/themes/redmond98/layouts/tiletop.png
deleted file mode 100644
index 98cade2..0000000
Binary files a/themes/redmond98/layouts/tiletop.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tiletopw.png b/themes/redmond98/layouts/tiletopw.png
deleted file mode 100644
index d1d0872..0000000
Binary files a/themes/redmond98/layouts/tiletopw.png and /dev/null differ
diff --git a/themes/redmond98/layouts/tilew.png b/themes/redmond98/layouts/tilew.png
deleted file mode 100644
index fde2ca4..0000000
Binary files a/themes/redmond98/layouts/tilew.png and /dev/null differ
diff --git a/themes/redmond98/submenu.png b/themes/redmond98/submenu.png
deleted file mode 100644
index b2778e2..0000000
Binary files a/themes/redmond98/submenu.png and /dev/null differ
diff --git a/themes/redmond98/taglist/squarefw.png b/themes/redmond98/taglist/squarefw.png
deleted file mode 100644
index 2a86430..0000000
Binary files a/themes/redmond98/taglist/squarefw.png and /dev/null differ
diff --git a/themes/redmond98/taglist/squarew.png b/themes/redmond98/taglist/squarew.png
deleted file mode 100644
index 913f2ca..0000000
Binary files a/themes/redmond98/taglist/squarew.png and /dev/null differ
diff --git a/themes/redmond98/theme.lua b/themes/redmond98/theme.lua
deleted file mode 100644
index fcbb7d2..0000000
--- a/themes/redmond98/theme.lua
+++ /dev/null
@@ -1,264 +0,0 @@
-local theme_assets = require("beautiful.theme_assets")
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-
-local gears = require("gears")
-local wibox = require("wibox")
-local gfs = require("gears.filesystem")
-local themes_path = os.getenv("HOME").."/.config/awesome/themes/"
-local theme_name = "redmond98"
-
-local theme = {}
-
-theme.font          = "Ubuntu Regular 9"
-theme.unitybar_width = dpi(55)
-
-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_height = 45
-theme.menu_button_inner_margin = 2
-theme.bg_normal     = "#c2c3c3"
-theme.bg_focus      = "#e2e3e3"
-theme.bg_urgent     = "#e2e3e3" 
-theme.bg_minimize   = "#d2d3d3" 
-theme.bg_systray    = theme.bg_normal
-
-theme.fg_normal     = "#121212"
-theme.fg_focus      = "#121212"
-theme.fg_urgent     = "#121212"
-theme.fg_minimize   = "#121212"
-
-theme.useless_gap   = dpi(10)
-theme.border_width  = dpi(1)
-theme.border_normal = theme.bg_normal
-theme.border_focus  = theme.bg_focus
-theme.border_marked = theme.bg_marked
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- tasklist_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- 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]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
-theme.hotkeys_border_color = "#262626"
-theme.hotkeys_opacity = 0.2
-theme.bgimage = function(context, cr, width, height)
-    local surface = gears.surface( 
-        themes_path..theme_name.."/assets/redmond98borders.svg"
-    )
-    local bg_width,bg_height = gears.surface.get_size(surface)
-    cr:scale(width / bg_width, height / bg_height)
-    cr:set_source_surface(surface)
-    cr:paint()
-end
-theme.button_widget = function(style) 
-    return {
-        {
-            id = "widget_container",
-            widget = wibox.container.margin,
-            margins = style.button_inner_margin,
-        },
-        bgimage = theme.bgimage,
-        id = "widget_background",
-        widget = wibox.container.background,
-        shape = style.button_shape,
-        shape_border_width = style.button_shape_border_width,
-        shape_border_color = style.button_shape_border_color,
-        fg = style.button_fg_normal
-    }
-end
-theme.icon_widget = function(style)
-    return {
-        {
-            id = "widget_container",
-            widget = wibox.container.margin,
-            margins = style.icon_inner_margin,
-        },
-        bgimage = theme.bgimage,
-        id = "widget_background",
-        widget = wibox.container.background,
-        shape = style.icon_shape,
-        shape_border_width = style.icon_shape_border_width,
-        shape_border_color = style.icon_shape_border_color,
-        fg = style.icon_fg_normal
-    }
-end
-theme.container_widget = function(style)
-    return {
-        {
-            id = "widget_container",
-            widget = wibox.container.margin,
-            margins = style.container_inner_margin,
-        },
-        bgimage = theme.bgimage,
-        id = "widget_background",
-        widget = wibox.container.background,
-        shape = style.container_shape,
-        shape_border_width = style.container_shape_border_width,
-        shape_border_color = style.container_shape_border_color,
-        fg = style.container_fg_normal
-    }
-end
-theme.inputbox_widget = function(style,prompt)
-    return {
-        {
-            {
-                id = "widget_prompt",
-                markup = prompt or "",
-                widget = wibox.widget.textbox,
-                fg = style.inputbox_fg_normal
-            },
-            id = "widget_container",
-            widget = wibox.container.margin,
-            margins = style.inputbox_inner_margin,
-        },
-        bgimage = theme.bgimage,
-        id = "widget_background",
-        widget = wibox.container.background,
-        shape = style.inputbox_shape,
-        shape_border_width = style.inputbox_shape_border_width,
-        shape_border_color = style.inputbox_shape_border_color
-    }
-end
-theme.titlebar_bg_focus = {
-    type = "linear",
-    from = { 0, 15 },
-    to = { 0, 0 },
-    stops = { { 0, "#3C3C3C"} , { 1 , "#424242"} }
-}
-
-theme.titlebar_bg_normal = {
-    type = "linear",
-    from = { 0, 15 },
-    to = { 0, 0 },
-    stops = { { 0, "#161617"} , { 1 , "#222223"} }
-
-}
-theme.topbar_bg = theme.titlebar_bg_normal
-
--- Generate taglist squares:
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    taglist_square_size, theme.fg_normal
-)
-
--- Variables set for theming notifications:
--- notification_font
--- not1ification_[bg|fg]
--- notification_[width|height|margin]
--- notification_[border_color|border_width|shape|opacity]
-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 = themes_path..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"
-
--- Define the image to load
-theme.titlebar_close_button_normal = themes_path..theme_name.."/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path..theme_name.."/titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path..theme_name.."/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path..theme_name.."/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path..theme_name.."/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path..theme_name.."/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path..theme_name.."/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path..theme_name.."/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path..theme_name.."/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path..theme_name.."/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path..theme_name.."/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path..theme_name.."/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path..theme_name.."/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path..theme_name.."/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path..theme_name.."/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path..theme_name.."/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path..theme_name.."/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path..theme_name.."/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path..theme_name.."/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path..theme_name.."/titlebar/maximized_focus_active.png"
-
-theme.wallpaper = themes_path..theme_name.."/background.png"
-
--- You can use your own layout icons like this:
-theme.layout_fairh = themes_path..theme_name.."/layouts/fairhw.png"
-theme.layout_fairv = themes_path..theme_name.."/layouts/fairvw.png"
-theme.layout_floating  = themes_path..theme_name.."/layouts/floatingw.png"
-theme.layout_magnifier = themes_path..theme_name.."/layouts/magnifierw.png"
-theme.layout_max = themes_path..theme_name.."/layouts/maxw.png"
-theme.layout_fullscreen = themes_path..theme_name.."/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path..theme_name.."/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path..theme_name.."/layouts/tileleftw.png"
-theme.layout_tile = themes_path..theme_name.."/layouts/tilew.png"
-theme.layout_tiletop = themes_path..theme_name.."/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path..theme_name.."/layouts/spiralw.png"
-theme.layout_dwindle = themes_path..theme_name.."/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path..theme_name.."/layouts/cornernww.png"
-theme.layout_cornerne = themes_path..theme_name.."/layouts/cornernew.png"
-theme.layout_cornersw = themes_path..theme_name.."/layouts/cornersww.png"
-theme.layout_cornerse = themes_path..theme_name.."/layouts/cornersew.png"
-
--- 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"
-
--- Recolor icons
-theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal")
-theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus")
-theme_assets.recolor_layout(theme,theme.fg_normal)
-
--- Powermenu icons
-theme.powercontrol_icon_shutdown = themes_path..theme_name.."/icons/shutdown.svg"
-theme.powercontrol_icon_suspend = themes_path..theme_name.."/icons/suspend.svg"
-theme.powercontrol_icon_lock = themes_path..theme_name.."/icons/lock.svg"
-
--- Volume icons
-theme.volume_icon_high = themes_path..theme_name.."/icons/volume-high.svg"
-theme.volume_icon_medium = themes_path..theme_name.."/icons/volume-medium.svg"
-theme.volume_icon_low = themes_path..theme_name.."/icons/volume-low.svg"
-theme.volume_icon_muted = themes_path..theme_name.."/icons/volume-muted.svg"
-
--- Battery icons
-theme.battery_caution_charging_symbolic = themes_path..theme_name.."/icons/battery-caution-charging-symbolic.svg"
-theme.battery_caution_symbolic = themes_path..theme_name.."/icons/battery-caution-symbolic.svg"
-theme.battery_empty_charging_symbolic = themes_path..theme_name.."/icons/battery-empty-charging-symbolic.svg"
-theme.battery_empty_symbolic = themes_path..theme_name.."/icons/battery-empty-symbolic.svg"
-theme.battery_full_charged_symbolic = themes_path..theme_name.."/icons/battery-full-charged-symbolic.svg"
-theme.battery_full_charging_symbolic = themes_path..theme_name.."/icons/battery-full-charging-symbolic.svg"
-theme.battery_full_symbolic = themes_path..theme_name.."/icons/battery-full-symbolic.svg"
-theme.battery_good_charging_symbolic = themes_path..theme_name.."/icons/battery-good-charging-symbolic.svg"
-theme.battery_good_symbolic = themes_path..theme_name.."/icons/battery-good-symbolic.svg"
-theme.battery_low_charging_symbolic = themes_path..theme_name.."/icons/battery-low-charging-symbolic.svg"
-theme.battery_low_symbolic = themes_path..theme_name.."/icons/battery-low-symbolic.svg"
-theme.battery_missing_symbolic = themes_path..theme_name.."/icons/battery-missing-symbolic.svg"
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/themes/redmond98/titlebar/close_focus.png b/themes/redmond98/titlebar/close_focus.png
deleted file mode 100644
index 01ef825..0000000
Binary files a/themes/redmond98/titlebar/close_focus.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/close_normal.png b/themes/redmond98/titlebar/close_normal.png
deleted file mode 100644
index 5448ed8..0000000
Binary files a/themes/redmond98/titlebar/close_normal.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/floating_focus_active.png b/themes/redmond98/titlebar/floating_focus_active.png
deleted file mode 100644
index 82dcc7c..0000000
Binary files a/themes/redmond98/titlebar/floating_focus_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/floating_focus_inactive.png b/themes/redmond98/titlebar/floating_focus_inactive.png
deleted file mode 100644
index c19ba80..0000000
Binary files a/themes/redmond98/titlebar/floating_focus_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/floating_normal_active.png b/themes/redmond98/titlebar/floating_normal_active.png
deleted file mode 100644
index 62342d1..0000000
Binary files a/themes/redmond98/titlebar/floating_normal_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/floating_normal_inactive.png b/themes/redmond98/titlebar/floating_normal_inactive.png
deleted file mode 100644
index e2bbdfa..0000000
Binary files a/themes/redmond98/titlebar/floating_normal_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/maximized_focus_active.png b/themes/redmond98/titlebar/maximized_focus_active.png
deleted file mode 100644
index d7dffd7..0000000
Binary files a/themes/redmond98/titlebar/maximized_focus_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/maximized_focus_inactive.png b/themes/redmond98/titlebar/maximized_focus_inactive.png
deleted file mode 100644
index 844389f..0000000
Binary files a/themes/redmond98/titlebar/maximized_focus_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/maximized_normal_active.png b/themes/redmond98/titlebar/maximized_normal_active.png
deleted file mode 100644
index a705f81..0000000
Binary files a/themes/redmond98/titlebar/maximized_normal_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/maximized_normal_inactive.png b/themes/redmond98/titlebar/maximized_normal_inactive.png
deleted file mode 100644
index 4c1ab1f..0000000
Binary files a/themes/redmond98/titlebar/maximized_normal_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/minimize_focus.png b/themes/redmond98/titlebar/minimize_focus.png
deleted file mode 100644
index caaceb2..0000000
Binary files a/themes/redmond98/titlebar/minimize_focus.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/minimize_normal.png b/themes/redmond98/titlebar/minimize_normal.png
deleted file mode 100644
index 36621d0..0000000
Binary files a/themes/redmond98/titlebar/minimize_normal.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/ontop_focus_active.png b/themes/redmond98/titlebar/ontop_focus_active.png
deleted file mode 100644
index 312c00b..0000000
Binary files a/themes/redmond98/titlebar/ontop_focus_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/ontop_focus_inactive.png b/themes/redmond98/titlebar/ontop_focus_inactive.png
deleted file mode 100644
index a48e1c5..0000000
Binary files a/themes/redmond98/titlebar/ontop_focus_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/ontop_normal_active.png b/themes/redmond98/titlebar/ontop_normal_active.png
deleted file mode 100644
index 117a203..0000000
Binary files a/themes/redmond98/titlebar/ontop_normal_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/ontop_normal_inactive.png b/themes/redmond98/titlebar/ontop_normal_inactive.png
deleted file mode 100644
index d3a10c8..0000000
Binary files a/themes/redmond98/titlebar/ontop_normal_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/sticky_focus_active.png b/themes/redmond98/titlebar/sticky_focus_active.png
deleted file mode 100644
index 814499b..0000000
Binary files a/themes/redmond98/titlebar/sticky_focus_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/sticky_focus_inactive.png b/themes/redmond98/titlebar/sticky_focus_inactive.png
deleted file mode 100644
index 21b000d..0000000
Binary files a/themes/redmond98/titlebar/sticky_focus_inactive.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/sticky_normal_active.png b/themes/redmond98/titlebar/sticky_normal_active.png
deleted file mode 100644
index bdb5595..0000000
Binary files a/themes/redmond98/titlebar/sticky_normal_active.png and /dev/null differ
diff --git a/themes/redmond98/titlebar/sticky_normal_inactive.png b/themes/redmond98/titlebar/sticky_normal_inactive.png
deleted file mode 100644
index a96b9b1..0000000
Binary files a/themes/redmond98/titlebar/sticky_normal_inactive.png and /dev/null differ
diff --git a/themes/unity2/icons/README.md b/themes/unity2/icons/README.md
new file mode 100644
index 0000000..b43f74a
--- /dev/null
+++ b/themes/unity2/icons/README.md
@@ -0,0 +1,5 @@
+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)
+
+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.
+
+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.
diff --git a/themes/unity2/icons/mail.svg b/themes/unity2/icons/mail.svg
new file mode 100644
index 0000000..59d2196
--- /dev/null
+++ b/themes/unity2/icons/mail.svg
@@ -0,0 +1,167 @@
+<?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 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="mail.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="12.429181"
+     inkscape:cx="20.636919"
+     inkscape:cy="24.699939"
+     inkscape:window-width="1861"
+     inkscape:window-height="1036"
+     inkscape:window-x="57"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect1426"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect1426"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <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="">
+        <rect
+           style="fill:#000000;stroke-width:0.211917;paint-order:markers fill stroke"
+           id="rect1412"
+           width="3.4200001"
+           height="0.30000001"
+           x="8"
+           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"
+           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"
+           d="m 8,4 h 2.090121 V 4.3 H 8 Z" />
+        <g
+           id="g1422"
+           transform="translate(0.37425409,0.82359072)">
+          <rect
+             style="fill:#000000;stroke-width:0.280281;paint-order:markers fill stroke"
+             id="rect1418"
+             width="8"
+             height="0.60000002"
+             x="0.12422053"
+             y="3.3848631"
+             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"
+             width="8"
+             height="0.60000002"
+             x="2.9901919"
+             y="-8.5405416"
+             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-effect1426_inverse"
+       inkscape:label="filtermask-powermask-path-effect1426"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1426_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         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>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       style="fill:#000000;stroke-width:0.268114;paint-order:markers fill stroke"
+       id="rect846"
+       width="12"
+       height="8.5"
+       x="0.34999999"
+       y="2.0999999"
+       mask="url(#mask-powermask-path-effect1426)"
+       inkscape:path-effect="#path-effect1426"
+       d="M 0.34999999,2.0999999 H 12.35 V 10.6 H 0.34999999 Z"
+       sodipodi:type="rect" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2" />
+  <metadata
+     id="metadata1469">
+    <rdf:RDF>
+      <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>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/themes/unity2/icons/wallpaper.svg b/themes/unity2/icons/wallpaper.svg
new file mode 100644
index 0000000..67ede24
--- /dev/null
+++ b/themes/unity2/icons/wallpaper.svg
@@ -0,0 +1,127 @@
+<?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 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="wallpaper.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="8.7887579"
+     inkscape:cx="13.028007"
+     inkscape:cy="33.224262"
+     inkscape:window-width="1861"
+     inkscape:window-height="1036"
+     inkscape:window-x="57"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect1223"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect1223"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect1223">
+      <path
+         id="mask-powermask-path-effect1223_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="g1221"
+         style="">
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 0.0949415,6.9698846 c 0,0 2.8336941,-3.6936048 6.2996354,-0.063817 C 9.860518,10.535855 12.596156,6.5435112 12.596156,6.5435112"
+           id="path1217" />
+        <circle
+           style="fill:#000000;stroke-width:0.564999;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
+           id="circle1219"
+           cx="9.5882559"
+           cy="3.6883583"
+           r="1.2"
+           d="M 10.788256,3.6883583 A 1.2,1.2 0 0 1 9.5882559,4.8883584 1.2,1.2 0 0 1 8.3882558,3.6883583 a 1.2,1.2 0 0 1 1.2000001,-1.2 1.2,1.2 0 0 1 1.2000001,1.2 z" />
+      </g>
+    </mask>
+    <filter
+       id="mask-powermask-path-effect1223_inverse"
+       inkscape:label="filtermask-powermask-path-effect1223"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect1223_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect1223_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
+       style="fill:#000000;stroke-width:0.358658;paint-order:markers fill stroke"
+       id="rect910"
+       width="12"
+       height="8.5"
+       x="0.34999999"
+       y="2.0999999"
+       mask="url(#mask-powermask-path-effect1223)"
+       inkscape:path-effect="#path-effect1223"
+       d="M 0.34999999,2.0999999 H 12.35 V 10.6 H 0.34999999 Z"
+       sodipodi:type="rect" />
+  </g>
+  <metadata
+     id="metadata886">
+    <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>
diff --git a/themes/unity2/theme.lua b/themes/unity2/theme.lua
index cfb63ef..fc21716 100644
--- a/themes/unity2/theme.lua
+++ b/themes/unity2/theme.lua
@@ -2,15 +2,12 @@ local theme_assets = require("beautiful.theme_assets")
 local xresources = require("beautiful.xresources")
 local dpi = xresources.apply_dpi
 
-local gfs = require("gears.filesystem")
-local themes_path = os.getenv("HOME").."/.config/awesome/themes/"
-local theme_name = "unity2"
-
 local theme = {}
 
+theme.name = "unity2"
+
 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"
@@ -91,7 +88,7 @@ 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 = themes_path..theme_name.."/submenu.png"
+theme.menu_submenu_icon = global.themes_dir..theme.name.."/submenu.png"
 theme.menu_height = dpi(18)
 theme.menu_width  = dpi(140)
 
@@ -101,51 +98,51 @@ theme.menu_width  = dpi(140)
 --theme.bg_widget = "#cc0000"
 
 -- Define the image to load
-theme.titlebar_close_button_normal = themes_path..theme_name.."/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path..theme_name.."/titlebar/close_focus.png"
+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"
 
-theme.titlebar_minimize_button_normal = themes_path..theme_name.."/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path..theme_name.."/titlebar/minimize_focus.png"
+theme.titlebar_minimize_button_normal = global.themes_dir..theme.name.."/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = global.themes_dir..theme.name.."/titlebar/minimize_focus.png"
 
-theme.titlebar_ontop_button_normal_inactive = themes_path..theme_name.."/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path..theme_name.."/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path..theme_name.."/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path..theme_name.."/titlebar/ontop_focus_active.png"
+theme.titlebar_ontop_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = global.themes_dir..theme.name.."/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = global.themes_dir..theme.name.."/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = global.themes_dir..theme.name.."/titlebar/ontop_focus_active.png"
 
-theme.titlebar_sticky_button_normal_inactive = themes_path..theme_name.."/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path..theme_name.."/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path..theme_name.."/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path..theme_name.."/titlebar/sticky_focus_active.png"
+theme.titlebar_sticky_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = global.themes_dir..theme.name.."/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = global.themes_dir..theme.name.."/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = global.themes_dir..theme.name.."/titlebar/sticky_focus_active.png"
 
-theme.titlebar_floating_button_normal_inactive = themes_path..theme_name.."/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path..theme_name.."/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path..theme_name.."/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path..theme_name.."/titlebar/floating_focus_active.png"
+theme.titlebar_floating_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = global.themes_dir..theme.name.."/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = global.themes_dir..theme.name.."/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = global.themes_dir..theme.name.."/titlebar/floating_focus_active.png"
 
-theme.titlebar_maximized_button_normal_inactive = themes_path..theme_name.."/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path..theme_name.."/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path..theme_name.."/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path..theme_name.."/titlebar/maximized_focus_active.png"
+theme.titlebar_maximized_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = global.themes_dir..theme.name.."/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = global.themes_dir..theme.name.."/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = global.themes_dir..theme.name.."/titlebar/maximized_focus_active.png"
 
-theme.wallpaper = themes_path..theme_name.."/background.png"
+theme.wallpaper = global.themes_dir..theme.name.."/background.png"
 
 -- You can use your own layout icons like this:
-theme.layout_fairh = themes_path..theme_name.."/layouts/fairhw.png"
-theme.layout_fairv = themes_path..theme_name.."/layouts/fairvw.png"
-theme.layout_floating  = themes_path..theme_name.."/layouts/floatingw.png"
-theme.layout_magnifier = themes_path..theme_name.."/layouts/magnifierw.png"
-theme.layout_max = themes_path..theme_name.."/layouts/maxw.png"
-theme.layout_fullscreen = themes_path..theme_name.."/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path..theme_name.."/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path..theme_name.."/layouts/tileleftw.png"
-theme.layout_tile = themes_path..theme_name.."/layouts/tilew.png"
-theme.layout_tiletop = themes_path..theme_name.."/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path..theme_name.."/layouts/spiralw.png"
-theme.layout_dwindle = themes_path..theme_name.."/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path..theme_name.."/layouts/cornernww.png"
-theme.layout_cornerne = themes_path..theme_name.."/layouts/cornernew.png"
-theme.layout_cornersw = themes_path..theme_name.."/layouts/cornersww.png"
-theme.layout_cornerse = themes_path..theme_name.."/layouts/cornersew.png"
+theme.layout_fairh = global.themes_dir..theme.name.."/layouts/fairhw.png"
+theme.layout_fairv = global.themes_dir..theme.name.."/layouts/fairvw.png"
+theme.layout_floating  = global.themes_dir..theme.name.."/layouts/floatingw.png"
+theme.layout_magnifier = global.themes_dir..theme.name.."/layouts/magnifierw.png"
+theme.layout_max = global.themes_dir..theme.name.."/layouts/maxw.png"
+theme.layout_fullscreen = global.themes_dir..theme.name.."/layouts/fullscreenw.png"
+theme.layout_tilebottom = global.themes_dir..theme.name.."/layouts/tilebottomw.png"
+theme.layout_tileleft   = global.themes_dir..theme.name.."/layouts/tileleftw.png"
+theme.layout_tile = global.themes_dir..theme.name.."/layouts/tilew.png"
+theme.layout_tiletop = global.themes_dir..theme.name.."/layouts/tiletopw.png"
+theme.layout_spiral  = global.themes_dir..theme.name.."/layouts/spiralw.png"
+theme.layout_dwindle = global.themes_dir..theme.name.."/layouts/dwindlew.png"
+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"
 
 -- Generate Awesome icon:
 theme.awesome_icon = theme_assets.awesome_icon(
@@ -156,35 +153,6 @@ theme.awesome_icon = theme_assets.awesome_icon(
 -- from /usr/share/icons and /usr/share/icons/hicolor will be used.
 theme.icon_theme = "Adwaita"
 
--- Recolor icons
-theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal")
-theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus")
-theme_assets.recolor_layout(theme,theme.fg_normal)
-
--- Powermenu icons
-theme.powercontrol_icon_shutdown = themes_path..theme_name.."/icons/shutdown.svg"
-theme.powercontrol_icon_suspend = themes_path..theme_name.."/icons/suspend.svg"
-theme.powercontrol_icon_lock = themes_path..theme_name.."/icons/lock.svg"
-
--- Volume icons
-theme.volume_icon_high = themes_path..theme_name.."/icons/volume-high.svg"
-theme.volume_icon_medium = themes_path..theme_name.."/icons/volume-medium.svg"
-theme.volume_icon_low = themes_path..theme_name.."/icons/volume-low.svg"
-theme.volume_icon_muted = themes_path..theme_name.."/icons/volume-muted.svg"
-
--- Battery icons
-theme.battery_caution_charging_symbolic = themes_path..theme_name.."/icons/battery-caution-charging-symbolic.svg"
-theme.battery_caution_symbolic = themes_path..theme_name.."/icons/battery-caution-symbolic.svg"
-theme.battery_empty_charging_symbolic = themes_path..theme_name.."/icons/battery-empty-charging-symbolic.svg"
-theme.battery_empty_symbolic = themes_path..theme_name.."/icons/battery-empty-symbolic.svg"
-theme.battery_full_charged_symbolic = themes_path..theme_name.."/icons/battery-full-charged-symbolic.svg"
-theme.battery_full_charging_symbolic = themes_path..theme_name.."/icons/battery-full-charging-symbolic.svg"
-theme.battery_full_symbolic = themes_path..theme_name.."/icons/battery-full-symbolic.svg"
-theme.battery_good_charging_symbolic = themes_path..theme_name.."/icons/battery-good-charging-symbolic.svg"
-theme.battery_good_symbolic = themes_path..theme_name.."/icons/battery-good-symbolic.svg"
-theme.battery_low_charging_symbolic = themes_path..theme_name.."/icons/battery-low-charging-symbolic.svg"
-theme.battery_low_symbolic = themes_path..theme_name.."/icons/battery-low-symbolic.svg"
-theme.battery_missing_symbolic = themes_path..theme_name.."/icons/battery-missing-symbolic.svg"
 return theme
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/widgets/battery.lua b/widgets/battery.lua
index 891e133..6f22842 100644
--- a/widgets/battery.lua
+++ b/widgets/battery.lua
@@ -6,14 +6,11 @@ local awmtk = require("awmtk")
 return function(args)
     local style = awmtk.style(awmtk.defaults, args.style or {},"battery_")
     local device = args.device or "default"
-    local power_command = args.command or "upower -d"
-    local function get_icon(name)
-        return style[name]
-    end
+    local power_command = args.command or {"upower", "-d"}
     local icon = style.icon({
         {
             widget = wibox.widget.imagebox,
-            image = get_icon("battery_missing_symbolic"),
+            image = style["battery_missing_symbolic"],
             id = "widget_icon",
             resize = true
         },
@@ -30,12 +27,11 @@ return function(args)
         timeout = 10,
         call_now = true,
         callback = function()
-            awful.spawn.easy_async_with_shell(power_command, function(out)
+            awful.spawn.easy_async(power_command, function(out)
                 local icon_name = out:match("icon%-name:%s+'(battery%-[^']+)'")
                 local value = out:match("percentage:%s+(%d+%%)")
                 icon:get_children_by_id("widget_icon")[1].image = 
-                    gears.color.recolor_image(get_icon(icon_name:gsub("%-","_")),
-                        style.battery_icon_fg_normal)
+                    style[icon_name:gsub("%-","_")]
                 if args.percentage and value then
                     icon:get_children_by_id("widget_text")[1].markup = value
                 end
diff --git a/widgets/mailbox/init.lua b/widgets/mailbox.lua
similarity index 92%
rename from widgets/mailbox/init.lua
rename to widgets/mailbox.lua
index 0ef3bbb..66f1f3a 100644
--- a/widgets/mailbox/init.lua
+++ b/widgets/mailbox.lua
@@ -7,14 +7,10 @@ local naughty = require("naughty")
 local awmtk_status,awmtk = pcall(require,"awmtk")
 local dbus_config = require("naughty.dbus")
 local widget = {}
-local path_to_icons = os.getenv("HOME").."/.config/awesome/widgets/mailbox/"
 local function worker(args)
-    local style = {}
     local args = args or {}
     -- Set up style variables
-    if awmtk_status then
-        style = awmtk.style(awmtk.defaults,args.style,"mailbox_")
-    end
+    style = awmtk.style(awmtk.defaults,args.style,"mailbox_")
     style.mailbox_container_width = style.mailbox_container_width or 260
     style.mailbox_button_height = style.mailbox_button_heihgt or 40
     args.mail_limit = args.mail_limit or 8
@@ -47,8 +43,7 @@ local function worker(args)
     -- Create a mailbox button
     args.screen.notify_widget = style.icon (
         {
-            image  = gears.color.recolor_image(path_to_icons.."Mail.png",
-                style.mailbox_icon_fg_normal),
+            image  = style["mailbox_icon"],
             widget = wibox.widget.imagebox
         },{},{
             function() 
diff --git a/widgets/mailbox/Mail.png b/widgets/mailbox/Mail.png
deleted file mode 100644
index d5f0ed9..0000000
Binary files a/widgets/mailbox/Mail.png and /dev/null differ
diff --git a/widgets/volume.lua b/widgets/volume.lua
index b0185a3..b905fbd 100644
--- a/widgets/volume.lua
+++ b/widgets/volume.lua
@@ -16,10 +16,6 @@ return function(args)
         "Master",
         "Headphone"
     }
-    for k,v in pairs(icons) do
-        icons[k] = gears.color.recolor_image(v,
-            style.volume_icon_fg_normal)
-    end
     local function get_icon(percent)
         if percent >= 66 then
             return icons.high
diff --git a/widgets/wallpapers/init.lua b/widgets/wallpapers.lua
similarity index 78%
rename from widgets/wallpapers/init.lua
rename to widgets/wallpapers.lua
index 0dffe5a..175579b 100644
--- a/widgets/wallpapers/init.lua
+++ b/widgets/wallpapers.lua
@@ -3,10 +3,9 @@ local beautiful = require("beautiful")
 local gears = require("gears")
 local spawn = require("awful.spawn")
 local wibox = require("wibox")
-local naughty = require("naughty")
 local awmtk = require("awmtk")
+local thumbnailer = require("thumbnail")
 local widget = {}
-local path_to_icons = os.getenv("HOME").."/.config/awesome/widgets/wallpapers/"
 local function ls(path)
     local ls_data = io.popen("ls -1 "..path)
     local output = {}
@@ -21,20 +20,22 @@ end
 
 local function worker(args)
     local args = args or {}
-    if not args["screen"] then error("Screen not specified") end
-    if not args["path"] then error("Path to wallpapers folder not specified") end
-    args["configdir"] = args["configdir"] or os.getenv("HOME")
+    assert(type(args["screen"]) ~= "nil","Screen not specified")
+    assert(type(args["path"]) ~= "nil","Path to wallpapers folder not specified")
+    --add an extra slash to path if there is none
+    if not args["path"]:match("/$") then
+        args["path"] = args["path"].."/"
+    end
     --create local style
-    local style = {}
-    style = awmtk.style(awmtk.defaults,args.style or {},"wallpapers_")
+    local style = awmtk.style(awmtk.defaults,args.style or {},"wallpapers_")
     --set wallpaper
-    local handler = io.open(args["configdir"].."/.wallpaper","r") 
+    local handler = io.open(global.config_dir.."/.wallpaper","r") 
     if handler then
         local wallpaper_path = handler:read("*a")
         gears.wallpaper.maximized(wallpaper_path,args["screen"])
     end
     local function update_last_wallpaper(s)
-        local handler = io.open(args["configdir"].."/.wallpaper","w")
+        local handler = io.open(global.config_dir.."/.wallpaper","w")
         handler:write(s)
         handler:close()
     end
@@ -44,12 +45,14 @@ local function worker(args)
         if not (v:match("%.jpg$") or v:match("%.png$")) then
             image_list[k] = nil
         end
-    end
+    end 
+    --generate thumbnails to save up memory
+    thumbnailer.generate(args["path"],args["path"]..".thumbnails",60)
     --style variables
     local button_bg = style.wallpapers_button_bg_focus
     local function new_wallpaper_button(image,s)
         local new_widget = style.button({
-            image  = args["path"]..image,
+            image  = args["path"]..".thumbnails/"..image,
             resize = true,
             widget = wibox.widget.imagebox
         },{
@@ -84,8 +87,7 @@ local function worker(args)
         }
     ))
     local clip_widget = style.icon({
-        image  = gears.color.recolor_image(path_to_icons.."wallpaper-icon.png",
-            style.wallpapers_icon_fg_normal),
+        image  = style["wallpapers_icon"],
         resize = true,
         widget = wibox.widget.imagebox
     },{},{
diff --git a/widgets/wallpapers/wallpaper-icon.png b/widgets/wallpapers/wallpaper-icon.png
deleted file mode 100644
index d7c6f9b..0000000
Binary files a/widgets/wallpapers/wallpaper-icon.png and /dev/null differ