diff --git a/themes/night/layouts/cornerne.png b/themes/night/layouts/cornerne.png
deleted file mode 100644
index c85bd56a3..000000000
Binary files a/themes/night/layouts/cornerne.png and /dev/null differ
diff --git a/themes/night/layouts/cornernew.png b/themes/night/layouts/cornernew.png
deleted file mode 100644
index c3fd98618..000000000
Binary files a/themes/night/layouts/cornernew.png and /dev/null differ
diff --git a/themes/night/layouts/cornernw.png b/themes/night/layouts/cornernw.png
deleted file mode 100644
index dfe78b3da..000000000
Binary files a/themes/night/layouts/cornernw.png and /dev/null differ
diff --git a/themes/night/layouts/cornernww.png b/themes/night/layouts/cornernww.png
deleted file mode 100644
index f489010a3..000000000
Binary files a/themes/night/layouts/cornernww.png and /dev/null differ
diff --git a/themes/night/layouts/cornerse.png b/themes/night/layouts/cornerse.png
deleted file mode 100644
index 023ae79ad..000000000
Binary files a/themes/night/layouts/cornerse.png and /dev/null differ
diff --git a/themes/night/layouts/cornersew.png b/themes/night/layouts/cornersew.png
deleted file mode 100644
index f7cfa1c0d..000000000
Binary files a/themes/night/layouts/cornersew.png and /dev/null differ
diff --git a/themes/night/layouts/cornersw.png b/themes/night/layouts/cornersw.png
deleted file mode 100644
index c1453c9fd..000000000
Binary files a/themes/night/layouts/cornersw.png and /dev/null differ
diff --git a/themes/night/layouts/cornersww.png b/themes/night/layouts/cornersww.png
deleted file mode 100644
index a65a0430c..000000000
Binary files a/themes/night/layouts/cornersww.png and /dev/null differ
diff --git a/themes/night/layouts/dwindle.png b/themes/night/layouts/dwindle.png
deleted file mode 100644
index 9902d22d9..000000000
Binary files a/themes/night/layouts/dwindle.png and /dev/null differ
diff --git a/themes/night/layouts/dwindlew.png b/themes/night/layouts/dwindlew.png
deleted file mode 100644
index 9199049bd..000000000
Binary files a/themes/night/layouts/dwindlew.png and /dev/null differ
diff --git a/themes/night/layouts/fairh.png b/themes/night/layouts/fairh.png
deleted file mode 100644
index d41deead1..000000000
Binary files a/themes/night/layouts/fairh.png and /dev/null differ
diff --git a/themes/night/layouts/fairhw.png b/themes/night/layouts/fairhw.png
deleted file mode 100644
index bb50e3ae1..000000000
Binary files a/themes/night/layouts/fairhw.png and /dev/null differ
diff --git a/themes/night/layouts/fairv.png b/themes/night/layouts/fairv.png
deleted file mode 100644
index f5f02888a..000000000
Binary files a/themes/night/layouts/fairv.png and /dev/null differ
diff --git a/themes/night/layouts/fairvw.png b/themes/night/layouts/fairvw.png
deleted file mode 100644
index 4f4ed5221..000000000
Binary files a/themes/night/layouts/fairvw.png and /dev/null differ
diff --git a/themes/night/layouts/floating.png b/themes/night/layouts/floating.png
deleted file mode 100644
index b8061a058..000000000
Binary files a/themes/night/layouts/floating.png and /dev/null differ
diff --git a/themes/night/layouts/floatingw.png b/themes/night/layouts/floatingw.png
deleted file mode 100644
index 481589427..000000000
Binary files a/themes/night/layouts/floatingw.png and /dev/null differ
diff --git a/themes/night/layouts/fullscreen.png b/themes/night/layouts/fullscreen.png
deleted file mode 100644
index d02f6fc33..000000000
Binary files a/themes/night/layouts/fullscreen.png and /dev/null differ
diff --git a/themes/night/layouts/fullscreenw.png b/themes/night/layouts/fullscreenw.png
deleted file mode 100644
index 5c35bfa8a..000000000
Binary files a/themes/night/layouts/fullscreenw.png and /dev/null differ
diff --git a/themes/night/layouts/magnifier.png b/themes/night/layouts/magnifier.png
deleted file mode 100644
index 2925414a5..000000000
Binary files a/themes/night/layouts/magnifier.png and /dev/null differ
diff --git a/themes/night/layouts/magnifierw.png b/themes/night/layouts/magnifierw.png
deleted file mode 100644
index 620955664..000000000
Binary files a/themes/night/layouts/magnifierw.png and /dev/null differ
diff --git a/themes/night/layouts/max.png b/themes/night/layouts/max.png
deleted file mode 100644
index 8d208445c..000000000
Binary files a/themes/night/layouts/max.png and /dev/null differ
diff --git a/themes/night/layouts/maxw.png b/themes/night/layouts/maxw.png
deleted file mode 100644
index 85f5ce3af..000000000
Binary files a/themes/night/layouts/maxw.png and /dev/null differ
diff --git a/themes/night/layouts/spiral.png b/themes/night/layouts/spiral.png
deleted file mode 100644
index d9434be1b..000000000
Binary files a/themes/night/layouts/spiral.png and /dev/null differ
diff --git a/themes/night/layouts/spiralw.png b/themes/night/layouts/spiralw.png
deleted file mode 100644
index b78dd8654..000000000
Binary files a/themes/night/layouts/spiralw.png and /dev/null differ
diff --git a/themes/night/layouts/tile.png b/themes/night/layouts/tile.png
deleted file mode 100644
index 3ede21e8c..000000000
Binary files a/themes/night/layouts/tile.png and /dev/null differ
diff --git a/themes/night/layouts/tilebottom.png b/themes/night/layouts/tilebottom.png
deleted file mode 100644
index 6f8c2570a..000000000
Binary files a/themes/night/layouts/tilebottom.png and /dev/null differ
diff --git a/themes/night/layouts/tilebottomw.png b/themes/night/layouts/tilebottomw.png
deleted file mode 100644
index a1de7b29f..000000000
Binary files a/themes/night/layouts/tilebottomw.png and /dev/null differ
diff --git a/themes/night/layouts/tileleft.png b/themes/night/layouts/tileleft.png
deleted file mode 100644
index 31d687047..000000000
Binary files a/themes/night/layouts/tileleft.png and /dev/null differ
diff --git a/themes/night/layouts/tileleftw.png b/themes/night/layouts/tileleftw.png
deleted file mode 100644
index cf14c25e6..000000000
Binary files a/themes/night/layouts/tileleftw.png and /dev/null differ
diff --git a/themes/night/layouts/tiletop.png b/themes/night/layouts/tiletop.png
deleted file mode 100644
index 98cade20c..000000000
Binary files a/themes/night/layouts/tiletop.png and /dev/null differ
diff --git a/themes/night/layouts/tiletopw.png b/themes/night/layouts/tiletopw.png
deleted file mode 100644
index d1d0872b8..000000000
Binary files a/themes/night/layouts/tiletopw.png and /dev/null differ
diff --git a/themes/night/layouts/tilew.png b/themes/night/layouts/tilew.png
deleted file mode 100644
index fde2ca4ee..000000000
Binary files a/themes/night/layouts/tilew.png and /dev/null differ
diff --git a/themes/night/submenu.png b/themes/night/submenu.png
deleted file mode 100644
index b2778e2eb..000000000
Binary files a/themes/night/submenu.png and /dev/null differ
diff --git a/themes/night/taglist/squarefw.png b/themes/night/taglist/squarefw.png
deleted file mode 100644
index 2a864309e..000000000
Binary files a/themes/night/taglist/squarefw.png and /dev/null differ
diff --git a/themes/night/taglist/squarew.png b/themes/night/taglist/squarew.png
deleted file mode 100644
index 913f2ca6b..000000000
Binary files a/themes/night/taglist/squarew.png and /dev/null differ
diff --git a/themes/night/theme.lua b/themes/night/theme.lua
index a772b67cd..0f482dc18 100644
--- a/themes/night/theme.lua
+++ b/themes/night/theme.lua
@@ -9,9 +9,11 @@ local rnotification = require("ruled.notification")
 local dpi = xresources.apply_dpi
 
 local gfs = require("gears.filesystem")
-local themes_path = gfs.get_themes_dir() .. "night/"
+local themes_path = gfs.get_themes_dir()
 
-local theme = {}
+-- inherit default theme
+local theme = dofile(themes_path .. "default/theme.lua")
+-- load vector assets' generators for this theme
 
 theme.font = "sans 8"
 
@@ -33,75 +35,34 @@ theme.border_color_active = "#000a0e"
 theme.border_color_marked = "#000a0e"
 
 -- Generate taglist squares:
-local taglist_square_size = dpi(0)
-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)
+--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)
+-- Or disable them:
+theme.taglist_squares_sel = nil
+theme.taglist_squares_unsel = nil
+
+-- Taglist
+theme.taglist_fg_focus = theme.bg_normal
+theme.taglist_bg_focus = theme.fg_focus
 
 -- Variables set for theming the menu:
-theme.menu_submenu_icon = themes_path .. "submenu.png"
+theme.menu_submenu_icon = nil
+theme.menu_submenu = "▸ "
 theme.menu_height = dpi(15)
 theme.menu_width = dpi(100)
 
 -- Notification
 theme.notification_border_color = theme.border_color_active
 
--- Define the image to load
-theme.titlebar_close_button_normal = themes_path .. "titlebar/close_normal.png"
-theme.titlebar_close_button_focus = themes_path .. "titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path .. "titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus = themes_path .. "titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path .. "titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive = themes_path .. "titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path .. "titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active = themes_path .. "titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path .. "titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive = themes_path .. "titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path .. "titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active = themes_path .. "titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path .. "titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive = themes_path .. "titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path .. "titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active = themes_path .. "titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path .. "titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive = themes_path .. "titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path .. "titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active = themes_path .. "titlebar/maximized_focus_active.png"
-
 -- Wallpaper
-theme.wallpaper = themes_path .. "background.png"
+theme.wallpaper = themes_path .. "night/background.png"
 
 -- Recolor Layout icons:
 theme = theme_assets.recolor_layout(theme, theme.fg_normal)
 
--- You can use your own layout icons like this:
-theme.layout_fairh = themes_path .. "layouts/fairhw.png"
-theme.layout_fairv = themes_path .. "layouts/fairvw.png"
-theme.layout_floating = themes_path .. "layouts/floatingw.png"
-theme.layout_magnifier = themes_path .. "layouts/magnifierw.png"
-theme.layout_max = themes_path .. "layouts/maxw.png"
-theme.layout_fullscreen = themes_path .. "layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path .. "layouts/tilebottomw.png"
-theme.layout_tileleft = themes_path .. "layouts/tileleftw.png"
-theme.layout_tile = themes_path .. "layouts/tilew.png"
-theme.layout_tiletop = themes_path .. "layouts/tiletopw.png"
-theme.layout_spiral = themes_path .. "layouts/spiralw.png"
-theme.layout_dwindle = themes_path .. "layouts/dwindlew.png"
-theme.layout_cornernw = themes_path .. "layouts/cornernww.png"
-theme.layout_cornerne = themes_path .. "layouts/cornernew.png"
-theme.layout_cornersw = themes_path .. "layouts/cornersww.png"
-theme.layout_cornerse = themes_path .. "layouts/cornersew.png"
-
 -- Generate Awesome icon:
-theme.awesome_icon = theme_assets.awesome_icon(theme.menu_height, "#535d6c", theme.bg_minimize)
-
--- 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 = nil
+theme.awesome_icon = theme_assets.awesome_icon(theme.menu_height, theme.fg_focus, theme.bg_minimize)
 
 -- Set different colors for urgent notifications.
 rnotification.connect_signal("request::rules", function()
diff --git a/themes/night/titlebar/close_focus.png b/themes/night/titlebar/close_focus.png
deleted file mode 100644
index 01ef82565..000000000
Binary files a/themes/night/titlebar/close_focus.png and /dev/null differ
diff --git a/themes/night/titlebar/close_normal.png b/themes/night/titlebar/close_normal.png
deleted file mode 100644
index 5448ed8f9..000000000
Binary files a/themes/night/titlebar/close_normal.png and /dev/null differ
diff --git a/themes/night/titlebar/floating_focus_active.png b/themes/night/titlebar/floating_focus_active.png
deleted file mode 100644
index 82dcc7ca6..000000000
Binary files a/themes/night/titlebar/floating_focus_active.png and /dev/null differ
diff --git a/themes/night/titlebar/floating_focus_inactive.png b/themes/night/titlebar/floating_focus_inactive.png
deleted file mode 100644
index c19ba8005..000000000
Binary files a/themes/night/titlebar/floating_focus_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/floating_normal_active.png b/themes/night/titlebar/floating_normal_active.png
deleted file mode 100644
index 62342d19e..000000000
Binary files a/themes/night/titlebar/floating_normal_active.png and /dev/null differ
diff --git a/themes/night/titlebar/floating_normal_inactive.png b/themes/night/titlebar/floating_normal_inactive.png
deleted file mode 100644
index e2bbdfa17..000000000
Binary files a/themes/night/titlebar/floating_normal_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/maximized_focus_active.png b/themes/night/titlebar/maximized_focus_active.png
deleted file mode 100644
index d7dffd755..000000000
Binary files a/themes/night/titlebar/maximized_focus_active.png and /dev/null differ
diff --git a/themes/night/titlebar/maximized_focus_inactive.png b/themes/night/titlebar/maximized_focus_inactive.png
deleted file mode 100644
index 844389f1f..000000000
Binary files a/themes/night/titlebar/maximized_focus_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/maximized_normal_active.png b/themes/night/titlebar/maximized_normal_active.png
deleted file mode 100644
index a705f8164..000000000
Binary files a/themes/night/titlebar/maximized_normal_active.png and /dev/null differ
diff --git a/themes/night/titlebar/maximized_normal_inactive.png b/themes/night/titlebar/maximized_normal_inactive.png
deleted file mode 100644
index 4c1ab1f91..000000000
Binary files a/themes/night/titlebar/maximized_normal_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/minimize_focus.png b/themes/night/titlebar/minimize_focus.png
deleted file mode 100644
index caaceb296..000000000
Binary files a/themes/night/titlebar/minimize_focus.png and /dev/null differ
diff --git a/themes/night/titlebar/minimize_normal.png b/themes/night/titlebar/minimize_normal.png
deleted file mode 100644
index 36621d0f3..000000000
Binary files a/themes/night/titlebar/minimize_normal.png and /dev/null differ
diff --git a/themes/night/titlebar/ontop_focus_active.png b/themes/night/titlebar/ontop_focus_active.png
deleted file mode 100644
index 312c00ba8..000000000
Binary files a/themes/night/titlebar/ontop_focus_active.png and /dev/null differ
diff --git a/themes/night/titlebar/ontop_focus_inactive.png b/themes/night/titlebar/ontop_focus_inactive.png
deleted file mode 100644
index a48e1c5c7..000000000
Binary files a/themes/night/titlebar/ontop_focus_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/ontop_normal_active.png b/themes/night/titlebar/ontop_normal_active.png
deleted file mode 100644
index 117a203c6..000000000
Binary files a/themes/night/titlebar/ontop_normal_active.png and /dev/null differ
diff --git a/themes/night/titlebar/ontop_normal_inactive.png b/themes/night/titlebar/ontop_normal_inactive.png
deleted file mode 100644
index d3a10c8a7..000000000
Binary files a/themes/night/titlebar/ontop_normal_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/sticky_focus_active.png b/themes/night/titlebar/sticky_focus_active.png
deleted file mode 100644
index 814499b16..000000000
Binary files a/themes/night/titlebar/sticky_focus_active.png and /dev/null differ
diff --git a/themes/night/titlebar/sticky_focus_inactive.png b/themes/night/titlebar/sticky_focus_inactive.png
deleted file mode 100644
index 21b000d89..000000000
Binary files a/themes/night/titlebar/sticky_focus_inactive.png and /dev/null differ
diff --git a/themes/night/titlebar/sticky_normal_active.png b/themes/night/titlebar/sticky_normal_active.png
deleted file mode 100644
index bdb5595db..000000000
Binary files a/themes/night/titlebar/sticky_normal_active.png and /dev/null differ
diff --git a/themes/night/titlebar/sticky_normal_inactive.png b/themes/night/titlebar/sticky_normal_inactive.png
deleted file mode 100644
index a96b9b195..000000000
Binary files a/themes/night/titlebar/sticky_normal_inactive.png and /dev/null differ