diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 97d5a45..cdfb9c9 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -78,10 +78,9 @@ awful.layout.layouts = {
     awful.layout.suit.tile.bottom,
     awful.layout.suit.tile.top,
     awful.layout.suit.fair,
-    awful.layout.suit.fair.horizontal,
     --awful.layout.suit.spiral,
     --awful.layout.suit.spiral.dwindle,
-    --awful.layout.suit.max,
+    awful.layout.suit.max,
     --awful.layout.suit.max.fullscreen,
     --awful.layout.suit.magnifier,
     awful.layout.suit.corner.nw,
diff --git a/awesome/.config/awesome/themes/default/theme.lua b/awesome/.config/awesome/themes/default/theme.lua
index 6dc55b2..030d611 100644
--- a/awesome/.config/awesome/themes/default/theme.lua
+++ b/awesome/.config/awesome/themes/default/theme.lua
@@ -104,22 +104,21 @@ theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/m
 --theme.wallpaper = themes_path.."default/background.png"
 theme.wallpaper = "~/Images/wallpaper.jpg"
 -- You can use your own layout icons like this:
-theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
-theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
-theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
-theme.layout_max = themes_path.."default/layouts/maxw.png"
-theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."default/layouts/tilew.png"
-theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
-theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
-theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
-theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
-theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
+theme.layout_fairv = themes_path.."default/layouts/fair.svg"
+theme.layout_floating  = themes_path.."default/layouts/floating.svg"
+theme.layout_magnifier = themes_path.."default/layouts/magnifier.svg"
+theme.layout_max = themes_path.."default/layouts/max.svg"
+theme.layout_fullscreen = themes_path.."default/layouts/fullscreen.svg"
+theme.layout_tilebottom = themes_path.."default/layouts/tilebottom.svg"
+theme.layout_tileleft   = themes_path.."default/layouts/tileleft.svg"
+theme.layout_tile = themes_path.."default/layouts/tile.svg"
+theme.layout_tiletop = themes_path.."default/layouts/tiletop.svg"
+theme.layout_spiral  = themes_path.."default/layouts/spiral.svg"
+theme.layout_dwindle = themes_path.."default/layouts/dwindle.svg"
+theme.layout_cornernw = themes_path.."default/layouts/cornernw.svg"
+theme.layout_cornerne = themes_path.."default/layouts/cornerne.svg"
+theme.layout_cornersw = themes_path.."default/layouts/cornersw.svg"
+theme.layout_cornerse = themes_path.."default/layouts/cornerse.svg"
 
 
 
@@ -129,7 +128,7 @@ theme.cpu_icon = icon_dir .. "cpu.png"
 theme.net_up = icon_dir .. "net_up.png"
 theme.net_down = icon_dir .. "net_down.png"
 theme.spr_right = icon_dir .. "spr_right.png"
-theme.mpd_icon = icon_dir .. "mpd.png"
+theme.mpd_icon = icon_dir .. "audio.svg"
 theme.ram_icon = icon_dir .. "ram.png"
 -- Generate Awesome icon:
 theme.awesome_icon = theme_assets.awesome_icon(