diff --git a/linux/.config/awesome/modules/notifs.lua b/linux/.config/awesome/modules/notifs.lua
index 6553bfb..e5eef33 100644
--- a/linux/.config/awesome/modules/notifs.lua
+++ b/linux/.config/awesome/modules/notifs.lua
@@ -1,4 +1,6 @@
 local beautiful = require("beautiful")
+local gears = require("gears")
+local lain = require("lain")
 local naughty = require("naughty")
 local ruled = require("ruled")
 local wibox = require("wibox")
@@ -55,6 +57,18 @@ naughty.connect_signal("request::display", function(n)
     bg = beautiful.win9x_unfocus
   end
 
+  local shadow_title = naughty.widget.title({
+    notification = n,
+  })
+  shadow_title:set_markup_silently(
+    lain.util.markup(
+      beautiful.__colors.color0,
+      gears.string.xml_escape(n.title)
+    )
+  )
+
+  n.text = n.text:gsub("\\", "\\\\")
+
   naughty.layout.box({
     notification = n,
     type = "notification",
@@ -82,7 +96,16 @@ naughty.connect_signal("request::display", function(n)
                 {
                   {
                     {
-                      naughty.widget.title,
+                      {
+                        {
+                          shadow_title,
+                          left = 1,
+                          top = 2,
+                          layout = wibox.container.margin,
+                        },
+                        naughty.widget.title,
+                        layout = wibox.layout.stack,
+                      },
                       left = 1,
                       right = 4,
                       layout = wibox.container.margin,
@@ -200,4 +223,4 @@ end)
     urgency = urgency,
     timeout = 10,
   })
-end--]]
\ No newline at end of file
+end--]]
diff --git a/linux/.config/awesome/modules/titlebar.lua b/linux/.config/awesome/modules/titlebar.lua
index 7fbe16e..724d7f9 100644
--- a/linux/.config/awesome/modules/titlebar.lua
+++ b/linux/.config/awesome/modules/titlebar.lua
@@ -103,22 +103,22 @@ client.connect_signal("request::titlebars", function(c)
   local shadow_title = awful.titlebar.widget.titlewidget(c)
   shadow_title.update = function() end
   local name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name)
-  shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_outer, name))
+  shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_title_unfocus or beautiful.win9x_outer, name))
 
   c:connect_signal("focus", function()
     name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name)
-    shadow_title:set_markup_silently(lain.util.markup(beautiful.__colors.color0, name))
+    shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_title_focus or beautiful.__colors.color, name))
     update_lines(true)
   end)
   c:connect_signal("unfocus", function()
     name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name)
-    shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_outer, name))
+    shadow_title:set_markup_silently(lain.util.markup(beautiful.win9x_title_unfocus or beautiful.win9x_outer, name))
     update_lines(false)
   end)
   c:connect_signal("property::name", function()
     name = gears.string.xml_escape(c.name or awful.titlebar.fallback_name)
     local focused = c == client.focus
-    local col = focused and beautiful.__colors.color0 or beautiful.win9x_outer
+    local col = focused and (beautiful.win9x_title_focus or beautiful.__colors.color0) or (beautiful.win9x_title_unfocus or beautiful.win9x_outer)
     shadow_title:set_markup_silently(lain.util.markup(col, name))
   end)
 
diff --git a/linux/.config/awesome/themes/embark.lua b/linux/.config/awesome/themes/embark.lua
new file mode 100755
index 0000000..d7a28de
--- /dev/null
+++ b/linux/.config/awesome/themes/embark.lua
@@ -0,0 +1,33 @@
+local vars = require("modules/vars")
+
+local theme = dofile(vars.env.THEME_DIR .. "/_base.lua")({
+    background = "#1E1C31",
+    foreground = "#CBE3E7",
+    secondary  = "#181627",
+    tertiary   = "#100E23",
+    accent     = "#3E3859",
+
+    color0 = "#2D2B40",
+    color1 = "#F48FB1",
+    color2 = "#A1EFD3",
+    color3 = "#FFE6B3",
+    color4 = "#91DDFF",
+    color5 = "#D4BFFF",
+    color6 = "#87DFEB",
+    color7 = "#8A889D",
+
+    color8  = "#100E23",
+    color9  = "#F02E6E",
+    color10 = "#62D196",
+    color11 = "#F2B482",
+    color12 = "#65B2FF",
+    color13 = "#A37ACC",
+    color14 = "#63F2F1",
+    color15 = "#585273",
+})
+
+theme.win9x_bright = "#2D2B40"
+theme.win9x_buttons_unfocus = "#2D2B40"
+theme.win9x_unfocus = "#8A889D"
+
+return theme
diff --git a/linux/.config/awesome/themes/valve16-goldsrc.lua b/linux/.config/awesome/themes/valve16-goldsrc.lua
new file mode 100755
index 0000000..e52f5b5
--- /dev/null
+++ b/linux/.config/awesome/themes/valve16-goldsrc.lua
@@ -0,0 +1,32 @@
+local vars = require("modules/vars")
+
+local theme = dofile(vars.env.THEME_DIR .. "/_base.lua")({
+    background = "#4c5844",
+    foreground = "#f7f8f7",
+    secondary  = "#3e4637",
+    tertiary   = "#282e22",
+    accent     = "#958831",
+
+    color0 = "#282e22",
+    color1 = "#aa0000",
+    color2 = "#4d7455",
+    color3 = "#cf6a32",
+    color4 = "#476291",
+    color5 = "#8650ac",
+    color6 = "#5e98d9",
+    color7 = "#837e77",
+
+    color8  = "#4c5844",
+    color9  = "#eb4b4b",
+    color10 = "#70b04a",
+    color11 = "#ffd700",
+    color12 = "#4b69ff",
+    color13 = "#8847ff",
+    color14 = "#38f3ab",
+    color15 = "#b2b2b2",
+})
+
+theme.win9x_bright = "#889180"
+theme.win9x_unfocus = "#889180"
+
+return theme