diff --git a/bindings/keys.lua b/bindings/keys.lua
index 2ef4636..2c84426 100644
--- a/bindings/keys.lua
+++ b/bindings/keys.lua
@@ -36,8 +36,19 @@ awful.keyboard.append_global_keybindings({
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
               {description = "run prompt", group = "launcher"}),
     awful.key({ modkey }, "p", function()
-                menubar.show()
-                screen.emit_signal('appdrawer::open', awful.screen.focused())
+                function script_path()
+                   local str = debug.getinfo(2, "S").source:sub(2)
+                   return str:match("(.*/)")
+                end
+                os.execute('rofi -show drun -config ' .. script_path() .. '../modules/appdrawer/drun.rasi')
+              end,
+              {description = "show the menubar", group = "launcher"}),
+    awful.key({ modkey }, "o", function()
+                function script_path()
+                   local str = debug.getinfo(2, "S").source:sub(2)
+                   return str:match("(.*/)")
+                end
+                os.execute('rofi -show combi -config ' .. script_path() .. '../modules/appdrawer/combi.rasi')
               end,
               {description = "show the menubar", group = "launcher"}),
 })
diff --git a/modules/appdrawer.lua b/modules/appdrawer.lua
deleted file mode 100644
index 912dca7..0000000
--- a/modules/appdrawer.lua
+++ /dev/null
@@ -1,208 +0,0 @@
-local awful = require("awful")
-local gears = require("gears")
-local wibox = require("wibox")
-local beautiful = require("beautiful")
-local apps = require("apps")
--- local naughty = require("naughty")
-
-local helpers = require("helpers")
-
--- Appearance
-local button_size = beautiful.app_drawer_icon_size or dpi(100)
---
-local keybinds = {}
-
--- Helper function that creates buttons given a text symbol, color, hover_color
--- and the command to run on click.
-local function create_button(symbol, color, hover_color, cmd, key)
-    local icon = wibox.widget {
-        markup = helpers.colorize_text(symbol, color),
-        align = "center",
-        valign = "center",
-        font = "icomoon 50",
-        forced_width = dpi(180),
-        forced_height = dpi(200),
-        widget = wibox.widget.textbox
-    }
-
-    -- Press "animation"
-    icon:connect_signal("button::press", function(_, _, __, button)
-        if button == 3 then
-            icon.markup = helpers.colorize_text(symbol, hover_color.."55")
-        end
-    end)
-    icon:connect_signal("button::release", function ()
-        icon.markup = helpers.colorize_text(symbol, hover_color)
-    end)
-
-    -- Hover "animation"
-    icon:connect_signal("mouse::enter", function ()
-        icon.markup = helpers.colorize_text(symbol, hover_color)
-    end)
-    icon:connect_signal("mouse::leave", function ()
-        icon.markup = helpers.colorize_text(symbol, color)
-    end)
-
-    -- Change cursor on hover
-    helpers.add_hover_cursor(icon, "hand1")
-
-    -- Adds mousebinds if cmd is provided
-    if cmd then
-        icon:buttons(gears.table.join(
-            awful.button({ }, 1, function ()
-                cmd()
-            end),
-            awful.button({ }, 3, function ()
-                cmd()
-            end)
-        ))
-    end
-
-    -- Add keybind to dict, if given
-    if key then
-        keybinds[key] = cmd
-    end
-
-    return icon
-end
-
--- Create app buttons
-local browser = create_button("", x.color3, x.color11, apps.browser, "w")
-local discord = create_button("", x.color5, x.color13, apps.discord, "d")
-local telegram = create_button("", x.color4, x.color12, apps.telegram, "t")
-local mail = create_button("", x.color6, x.color14, apps.mail, "m")
-local files = create_button("", x.color3, x.color11, apps.file_manager, "f")
-local gimp = create_button("", x.color5, x.color13, apps.gimp, "g")
-local youtube = create_button("", x.color1, x.color9, apps.youtube, "y")
-local networks = create_button("", x.color3, x.color11, apps.networks, "n")
-local passwords = create_button("", x.color1, x.color9, apps.passwords, "p")
-local night_mode = create_button("", x.color1, x.color9, apps.night_mode, "x")
-local record = create_button("", x.color4, x.color12, apps.record, "r")
-local lutris = create_button("", x.color6, x.color14, apps.lutris, "l")
-local steam = create_button("", x.color2, x.color10, apps.steam, "s")
-local org = create_button("", x.color2, x.color10, apps.org, "o")
-local compositor = create_button("", x.color5, x.color13, apps.compositor, "z")
-
-local restart_awesome = create_button("", x.color4, x.color12)
-restart_awesome:buttons(gears.table.join(
-    awful.button({ }, 1, awesome.restart)
-))
-
--- Create the widget
-app_drawer = wibox({visible = false, ontop = true, type = "dock"})
-awful.placement.maximize(app_drawer)
-
-app_drawer.bg = "#00000000"
--- app_drawer.bg = beautiful.app_drawer_bg or x.background or "#111111"
-app_drawer.fg = beautiful.app_drawer_fg or x.foreground or "#FEFEFE"
-
--- Add app drawer or mask to each screen
-for s in screen do
-    if s == screen.primary then
-        s.app_drawer = app_drawer
-    else
-        s.app_drawer = helpers.screen_mask(s, beautiful.lock_screen_bg or beautiful.exit_screen_bg or x.background)
-    end
-end
-
-local function set_visibility(v)
-    for s in screen do
-        s.app_drawer.visible = v
-    end
-end
-
-local app_drawer_grabber
-function app_drawer_hide()
-    awful.keygrabber.stop(app_drawer_grabber)
-    set_visibility(false)
-end
-
-function app_drawer_show()
-    -- naughty.notify({text = "starting the keygrabber"})
-    app_drawer_grabber = awful.keygrabber.run(function(_, key, event)
-        local invalid_key = false
-
-        -- Debug
-        -- naughty.notify({ title = event, text = key })
-        -- if event == "press" and key == "Alt_L" or key == "Alt_R" then
-        --     naughty.notify({ title = "you pressed alt" })
-        -- end
-        -- if event == "release" and key == "Alt_L" or key == "Alt_R" then
-        --     naughty.notify({ title = "you released alt" })
-        -- end
-
-        if event == "release" then return end
-
-        if keybinds[key] then
-            keybinds[key]()
-        else
-            invalid_key = true
-        end
-
-        if not invalid_key or key == 'Escape' then
-            app_drawer_hide()
-        end
-    end)
-
-    set_visibility(true)
-end
-
-app_drawer:buttons(gears.table.join(
-    -- Left click - Hide app_drawer
-    awful.button({ }, 1, function ()
-        app_drawer_hide()
-    end),
-    -- Right click - Hide app_drawer
-    awful.button({ }, 2, function ()
-        app_drawer_hide()
-    end),
-    -- Middle click - Hide app_drawer
-    awful.button({ }, 2, function ()
-        app_drawer_hide()
-    end)
-))
-
-local function create_stripe(widgets, bg)
-    local buttons = wibox.widget {
-        -- spacing = dpi(20),
-        layout = wibox.layout.fixed.horizontal
-    }
-
-    for _, widget in ipairs(widgets) do
-        buttons:add(widget)
-    end
-
-    local stripe = wibox.widget {
-        {
-            nil,
-            {
-                nil,
-                buttons,
-                expand = "none",
-                layout = wibox.layout.align.horizontal
-            },
-            expand = "none",
-            layout = wibox.layout.align.vertical
-        },
-        bg = bg,
-        widget = wibox.container.background
-    }
-
-    return stripe
-end
-
-app_drawer:setup {
-    -- Background
-    {
-        -- Stripes
-        create_stripe({browser, youtube, discord, telegram}, "#00000000"),
-        create_stripe({mail, org, files, passwords}, x.color8.."20"),
-        create_stripe({gimp, record, lutris, steam}, x.color8.."40"),
-        create_stripe({networks, night_mode, compositor, restart_awesome}, x.color8.."60"),
-        layout = wibox.layout.flex.vertical
-    },
-    bg = x.background,
-    -- bg = x.background.."AA",
-    -- bg = "#00000000",
-    widget = wibox.container.background
-}
diff --git a/modules/appdrawer/colors.rasi b/modules/appdrawer/colors.rasi
new file mode 100644
index 0000000..dc76cc6
--- /dev/null
+++ b/modules/appdrawer/colors.rasi
@@ -0,0 +1,7 @@
+* {
+  al:  #00000000;
+  bg:  #A0A8A2;
+  se:  #797D7A;
+  fg:  #FFFFFF;
+  ac:  #A0A8A2;
+}
diff --git a/modules/appdrawer/combi.rasi b/modules/appdrawer/combi.rasi
new file mode 100644
index 0000000..aa8a834
--- /dev/null
+++ b/modules/appdrawer/combi.rasi
@@ -0,0 +1,122 @@
+/*
+ *
+ * Author  : Aditya Shakya
+ * Mail    : adi1090x@gmail.com
+ * Github  : @adi1090x
+ * Twitter : @adi1090x
+ *
+ */
+
+
+configuration {
+	font:							"Iosevka Nerd Font 16";
+    show-icons:                     true;
+	icon-theme: 					"Papirus";
+    display-drun: 					"";
+    drun-display-format:            "{name}";
+    disable-history:                false;
+	sidebar-mode: 					false;
+}
+
+@import "colors.rasi"
+
+window {
+    transparency:                   "real";
+    background-color:               @bg;
+    text-color:                     @fg;
+	border:							none;
+	border-color:					@ac;
+    border-radius:                  10px;
+	height:							40%;
+	width:							50%;
+    location:                       northwest;
+    anchor:                       northwest;
+    x-offset:                       20;
+    y-offset:                       88;
+}
+
+prompt {
+    enabled: 						false;
+	padding: 						0.30% 1% 0% -0.5%;
+	background-color: 				@al;
+	text-color: 					@bg;
+}
+
+entry {
+    background-color:               @al;
+    text-color:                     @fg;
+    placeholder-color:              @fg;
+    expand:                         true;
+    horizontal-align:               0;
+    placeholder:                    "Search";
+    padding:                        0.10% 0% 0% 0%;
+    blink:                          true;
+}
+
+inputbar {
+	children: 						[ prompt, entry ];
+    background-color:               #00000000;
+    text-color:                     @bg;
+    expand:                         false;
+
+	border:							0% 0% 0% 0%;
+    border-radius:                  0px;
+	border-color:					@ac;
+    margin:                         0% 0% 0% 0%;
+    padding:                        1.5%;
+}
+
+listview {
+    background-color:               @al;
+    padding: 0px;
+    columns:                        1;
+    lines: 5;
+    spacing:                        0%;
+    cycle:                          false;
+    dynamic:                        true;
+    layout:                         vertical;
+}
+
+mainbox {
+    background-color:               @al;
+	border:							0% 0% 0% 0%;
+    border-radius:                  0% 0% 0% 0%;
+	border-color:					@ac;
+    children:                       [ inputbar, listview ];
+    spacing:                       	0%;
+    padding:                        0.5%;
+}
+
+element {
+    background-color:               @al;
+    text-color:                     @fg;
+    orientation:                    horizontal;
+    border-radius:                  0%;
+    padding:                        0.2% 0.2% 0.2% 0.2%;
+}
+
+element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
+    size:                           36px;
+    border:                         0px;
+}
+
+element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
+    expand:                         true;
+    horizontal-align:               0;
+    vertical-align:                 0;
+    margin:                         0.5% 0.5% 0.5% 0.5%;
+}
+
+element selected {
+    background-color:               @se;
+    text-color:                     @fg;
+	border:							0% 0% 0% 0%;
+    border-radius:                  4px;
+    border-color:                  	@bg;
+}
diff --git a/modules/appdrawer/drun.rasi b/modules/appdrawer/drun.rasi
new file mode 100644
index 0000000..5476d8b
--- /dev/null
+++ b/modules/appdrawer/drun.rasi
@@ -0,0 +1,122 @@
+/*
+ *
+ * Author  : Aditya Shakya
+ * Mail    : adi1090x@gmail.com
+ * Github  : @adi1090x
+ * Twitter : @adi1090x
+ *
+ */
+
+
+configuration {
+	font:							"Iosevka Nerd Font 16";
+    show-icons:                     true;
+	icon-theme: 					"Papirus";
+    display-drun: 					"";
+    drun-display-format:            "{name}";
+    disable-history:                false;
+	sidebar-mode: 					false;
+}
+
+@import "colors.rasi"
+
+window {
+    transparency:                   "real";
+    background-color:               @bg;
+    text-color:                     @fg;
+	border:							none;
+	border-color:					@ac;
+    border-radius:                  10px;
+	height:							40%;
+	width:							25%;
+    location:                       northwest;
+    anchor:                       northwest;
+    x-offset:                       20;
+    y-offset:                       88;
+}
+
+prompt {
+    enabled: 						false;
+	padding: 						0.30% 1% 0% -0.5%;
+	background-color: 				@al;
+	text-color: 					@bg;
+}
+
+entry {
+    background-color:               @al;
+    text-color:                     @fg;
+    placeholder-color:              @fg;
+    expand:                         true;
+    horizontal-align:               0;
+    placeholder:                    "Search";
+    padding:                        0.10% 0% 0% 0%;
+    blink:                          true;
+}
+
+inputbar {
+	children: 						[ prompt, entry ];
+    background-color:               #00000000;
+    text-color:                     @bg;
+    expand:                         false;
+
+	border:							0% 0% 0% 0%;
+    border-radius:                  0px;
+	border-color:					@ac;
+    margin:                         0% 0% 0% 0%;
+    padding:                        1.5%;
+}
+
+listview {
+    background-color:               @al;
+    padding: 0px;
+    columns:                        2;
+    lines: 5;
+    spacing:                        1%;
+    cycle:                          false;
+    dynamic:                        true;
+    layout:                         vertical;
+}
+
+mainbox {
+    background-color:               @al;
+	border:							0% 0% 0% 0%;
+    border-radius:                  0% 0% 0% 0%;
+	border-color:					@ac;
+    children:                       [ inputbar, listview ];
+    spacing:                       	0%;
+    padding:                        0.5%;
+}
+
+element {
+    background-color:               @al;
+    text-color:                     @fg;
+    orientation:                    horizontal;
+    border-radius:                  0%;
+    padding:                        1% 1% 1% 1%;
+}
+
+element-icon {
+    background-color: 				inherit;
+    text-color:       				inherit;
+    horizontal-align:               0.5;
+    vertical-align:                 0.5;
+    size:                           36px;
+    border:                         0px;
+}
+
+element-text {
+    background-color: 				@al;
+    text-color:       				inherit;
+    expand:                         true;
+    horizontal-align:               0;
+    vertical-align:                 0;
+    margin:                         0.5% 0.5% 0.5% 0.5%;
+}
+
+element selected {
+    background-color:               @se;
+    text-color:                     @fg;
+	border:							0% 0% 0% 0%;
+    border-radius:                  4px;
+    border-color:                  	@bg;
+}
diff --git a/modules/panel.lua b/modules/panel.lua
index f9345df..d718da7 100644
--- a/modules/panel.lua
+++ b/modules/panel.lua
@@ -39,70 +39,81 @@ modkey = "Mod4"
 screen.connect_signal("request::desktop_decoration", function(s)
 
   -- Create the wibox
-  s.mywibox = awful.wibar({ position = "top" ,height = beautiful.panel_height, screen = s })
+  s.mywibox = wibox({
+    ontop = true,
+    visible = true,
+    width = s.workarea.width - (beautiful.useless_gap * 4),
+    height = beautiful.panel_height,
+    y = beautiful.useless_gap * 2,
+    x = beautiful.useless_gap * 2,
+    screen = s,
+    shape = gears.shape.rounded_rect
+  })
 
-  -- Each screen has its own tag table.
-  awful.tag({ "main", "term", "dev", "browse", "social", "misc" }, s, awful.layout.layouts[1])
+  s.mywibox:struts({top = beautiful.panel_height + (beautiful.useless_gap * 2)})
 
-  -- Create a taglist widget
-  s.mytaglist = awful.widget.taglist {
-    screen  = s,
-    filter  = awful.widget.taglist.filter.all,
-    widget_template = {
-      {
+    -- Each screen has its own tag table.
+    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
+
+    -- Create a taglist widget
+    s.mytaglist = awful.widget.taglist {
+      screen  = s,
+      filter  = awful.widget.taglist.filter.all,
+      widget_template = {
         {
           {
-            id     = 'text_role',
-            widget = wibox.widget.textbox,
+            {
+              id     = 'text_role',
+              widget = wibox.widget.textbox,
+            },
+            layout = wibox.layout.fixed.horizontal,
           },
-          layout = wibox.layout.fixed.horizontal,
+          left  = 18,
+          right = 18,
+          widget = wibox.container.margin
         },
-        left  = 18,
-        right = 18,
-        widget = wibox.container.margin
+        id     = 'background_role',
+        widget = wibox.container.background,
       },
-      id     = 'background_role',
-      widget = wibox.container.background,
-    },
-    buttons = {
-      awful.button({ }, 1, function(t) t:view_only() end),
-      awful.button({ modkey }, 1, function(t)
-        if client.focus then
-          client.focus:move_to_tag(t)
-        end
-      end),
-      awful.button({ }, 3, awful.tag.viewtoggle),
-      awful.button({ modkey }, 3, function(t)
-        if client.focus then
-          client.focus:toggle_tag(t)
-        end
-      end),
-      awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
-      awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end),
+      buttons = {
+        awful.button({ }, 1, function(t) t:view_only() end),
+        awful.button({ modkey }, 1, function(t)
+          if client.focus then
+            client.focus:move_to_tag(t)
+          end
+        end),
+        awful.button({ }, 3, awful.tag.viewtoggle),
+        awful.button({ modkey }, 3, function(t)
+          if client.focus then
+            client.focus:toggle_tag(t)
+          end
+        end),
+        awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
+        awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end),
+      }
     }
-  }
 
-  -- Add widgets to the wibox
-  s.mywibox.widget = {
-    layout = wibox.layout.stack,
-    {
-      layout = wibox.layout.align.horizontal,
-      { -- Left widgets
-        layout = wibox.layout.fixed.horizontal,
-        s.mytaglist,
+    -- Add widgets to the wibox
+    s.mywibox.widget = {
+        layout = wibox.layout.stack,
+        {
+          layout = wibox.layout.align.horizontal,
+          { -- Left widgets
+          layout = wibox.layout.fixed.horizontal,
+          s.mytaglist,
+        },
+        nil,
+        {
+          layout = wibox.layout.fixed.horizontal,
+          cpu,
+          mem,
+          -- net,
+          bat,
+          -- sysload,
+          -- wibox.widget.systray(),
+        }
       },
-      nil,
-      {
-        layout = wibox.layout.fixed.horizontal,
-        cpu,
-        mem,
-        -- net,
-        bat,
-        -- sysload,
-        -- wibox.widget.systray(),
-      }
-    },
-    { -- Right widgets
+      { -- Right widgets
       layout = wibox.container.place,
       valign = "center",
       halign = "center",
diff --git a/rc.lua b/rc.lua
index 3539720..43f73e7 100644
--- a/rc.lua
+++ b/rc.lua
@@ -19,7 +19,7 @@ require('modules.client')
 require('modules.titlebar')
 require('modules.panel')
 -- require('modules.sidepanel')
--- require('modules.notifications')
+require('modules.notifications')
 -- require('modules.dock')
 -- require('modules.appdrawer')
 
@@ -93,8 +93,9 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
 -- {{{ Wibar
 
 
-
 screen.connect_signal("request::wallpaper", function(s)
+
+
     -- Wallpaper
     if beautiful.wallpaper then
         local wallpaper = beautiful.wallpaper
diff --git a/theme b/theme
index cac3d73..af9ff7b 120000
--- a/theme
+++ b/theme
@@ -1 +1 @@
-themes/pixelos/
\ No newline at end of file
+themes/aquarella/
\ No newline at end of file
diff --git a/themes/pixelos/assets.bck/mockup.svg b/themes/aquarella/assets/mockup.svg
similarity index 100%
rename from themes/pixelos/assets.bck/mockup.svg
rename to themes/aquarella/assets/mockup.svg
diff --git a/themes/aquarella/assets/titlebar/Readme.md b/themes/aquarella/assets/titlebar/Readme.md
new file mode 100644
index 0000000..ba92e09
--- /dev/null
+++ b/themes/aquarella/assets/titlebar/Readme.md
@@ -0,0 +1 @@
+convert *.png -scale 75% -set filename:f '%t' '%[filename:f].png'
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_blue_active.png b/themes/aquarella/assets/titlebar/buttons/button_blue_active.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_blue_active.png
rename to themes/aquarella/assets/titlebar/buttons/button_blue_active.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_blue_active_hover.png b/themes/aquarella/assets/titlebar/buttons/button_blue_active_hover.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_blue_active_hover.png
rename to themes/aquarella/assets/titlebar/buttons/button_blue_active_hover.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_blue_inactive.png b/themes/aquarella/assets/titlebar/buttons/button_blue_inactive.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_blue_inactive.png
rename to themes/aquarella/assets/titlebar/buttons/button_blue_inactive.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_blue_inactive_hover.png b/themes/aquarella/assets/titlebar/buttons/button_blue_inactive_hover.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_blue_inactive_hover.png
rename to themes/aquarella/assets/titlebar/buttons/button_blue_inactive_hover.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_red.png b/themes/aquarella/assets/titlebar/buttons/button_red.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_red.png
rename to themes/aquarella/assets/titlebar/buttons/button_red.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_red_hover.png b/themes/aquarella/assets/titlebar/buttons/button_red_hover.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_red_hover.png
rename to themes/aquarella/assets/titlebar/buttons/button_red_hover.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_yellow.png b/themes/aquarella/assets/titlebar/buttons/button_yellow.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_yellow.png
rename to themes/aquarella/assets/titlebar/buttons/button_yellow.png
diff --git a/themes/pixelos/assets.bck/titlebar/buttons/button_yellow_hover.png b/themes/aquarella/assets/titlebar/buttons/button_yellow_hover.png
similarity index 100%
rename from themes/pixelos/assets.bck/titlebar/buttons/button_yellow_hover.png
rename to themes/aquarella/assets/titlebar/buttons/button_yellow_hover.png
diff --git a/themes/aquarella/assets/titlebar/titlebar_bottom.png b/themes/aquarella/assets/titlebar/titlebar_bottom.png
new file mode 100644
index 0000000..1723305
Binary files /dev/null and b/themes/aquarella/assets/titlebar/titlebar_bottom.png differ
diff --git a/themes/aquarella/assets/titlebar/titlebar_middle.png b/themes/aquarella/assets/titlebar/titlebar_middle.png
new file mode 100644
index 0000000..f92d3bb
Binary files /dev/null and b/themes/aquarella/assets/titlebar/titlebar_middle.png differ
diff --git a/themes/aquarella/assets/titlebar/titlebar_top.png b/themes/aquarella/assets/titlebar/titlebar_top.png
new file mode 100644
index 0000000..77dc766
Binary files /dev/null and b/themes/aquarella/assets/titlebar/titlebar_top.png differ
diff --git a/themes/aquarella/assets/wallpaper/wallpaper1.jpg b/themes/aquarella/assets/wallpaper/wallpaper1.jpg
new file mode 100644
index 0000000..4225bd6
Binary files /dev/null and b/themes/aquarella/assets/wallpaper/wallpaper1.jpg differ
diff --git a/themes/pixelos/assets.bck/widget/widget_pill_bottom_left.png b/themes/aquarella/assets/widget/widget_pill_bottom_left.png
similarity index 100%
rename from themes/pixelos/assets.bck/widget/widget_pill_bottom_left.png
rename to themes/aquarella/assets/widget/widget_pill_bottom_left.png
diff --git a/themes/pixelos/assets.bck/widget/widget_pill_bottom_right.png b/themes/aquarella/assets/widget/widget_pill_bottom_right.png
similarity index 100%
rename from themes/pixelos/assets.bck/widget/widget_pill_bottom_right.png
rename to themes/aquarella/assets/widget/widget_pill_bottom_right.png
diff --git a/themes/pixelos/assets.bck/widget/widget_pill_top_left.png b/themes/aquarella/assets/widget/widget_pill_top_left.png
similarity index 100%
rename from themes/pixelos/assets.bck/widget/widget_pill_top_left.png
rename to themes/aquarella/assets/widget/widget_pill_top_left.png
diff --git a/themes/pixelos/assets.bck/widget/widget_pill_top_right.png b/themes/aquarella/assets/widget/widget_pill_top_right.png
similarity index 100%
rename from themes/pixelos/assets.bck/widget/widget_pill_top_right.png
rename to themes/aquarella/assets/widget/widget_pill_top_right.png
diff --git a/themes/aquarella/init.lua b/themes/aquarella/init.lua
new file mode 100644
index 0000000..d3cdaf3
--- /dev/null
+++ b/themes/aquarella/init.lua
@@ -0,0 +1,162 @@
+local filesystem = require('gears.filesystem')
+local beautiful  = require('beautiful')
+local gears      = require('gears')
+local dpi        = beautiful.xresources.apply_dpi
+
+local assets     = filesystem.get_configuration_dir() .. '/theme/assets/'
+
+local theme      = {}
+
+-- Icon
+theme.icon_theme = 'Papirus-Dark'
+
+-- Font
+-- theme.font = 'ProggyCleanTTCE Nerd Font Mono 12'
+-- theme.font = 'VictorMono Nerd Font Mono 10'
+theme.font = 'Iosevka Nerd Font Mono 10'
+
+-- Misc
+-- -- Wallpaper Image
+theme.wallpaper = assets .. 'wallpaper/wallpaper1.jpg'
+-- -- Solid Color
+gears.wallpaper.set("#20BEC6")
+
+theme.useless_gap = 10
+
+-- Colors
+theme.color_transparent = '#00000000'
+theme.background = '#77817AAA'
+
+theme.fg_normal = '#ffffff'
+theme.fg_focus = '#e4e4e4'
+theme.fg_urgent = '#CC9393'
+
+theme.bg_normal = theme.background
+theme.bg_focus = '#5a5a5a'
+theme.bg_urgent = '#3F3F3F'
+
+-- Tooltip
+theme.tooltip_bg = theme.background
+theme.tooltip_border_width = 0
+theme.tooltip_shape = gears.shape.rounded_rect
+
+-- Notifications
+theme.notification_bg = theme.background
+theme.notification_border_width = '1'
+theme.notification_border_color = "#FFFFFFFF"
+theme.notification_shape = gears.shape.rounded_rect
+
+-- Panel
+theme.panel_height = 48
+
+-- Menu
+theme.menu_height = 40
+theme.menu_bg_focus = theme.background
+theme.menu_bg_normal = theme.background
+
+-- Taglist
+theme.taglist_bg_empty = theme.background .. '00'
+theme.taglist_bg_occupied =  '#000000' .. '33'
+theme.taglist_bg_urgent = '#E91E63' .. '99'
+theme.taglist_bg_focus = '#000000' .. '55'
+theme.taglist_spacing = dpi(0)
+
+theme.apps_slack = assets .. 'titlebar/buttons/button_red.png'
+
+-- Tasklist
+theme.tasklist_bg_normal = theme.background .. '99'
+theme.tasklist_bg_focus = theme.background
+theme.tasklist_bg_urgent = '#E91E63' .. '99'
+theme.tasklist_fg_focus = '#DDDDDD'
+theme.tasklist_fg_urgent = '#ffffff'
+theme.tasklist_fg_normal = '#AAAAAA'
+
+-- Notification
+theme.notification_position = 'top_right'
+theme.notification_bg = theme.transparent
+theme.notification_margin = dpi(5)
+theme.notification_border_width = dpi(0)
+theme.notification_border_color = theme.transparent
+theme.notification_spacing = dpi(5)
+theme.notification_icon_resize_strategy = 'center'
+theme.notification_icon_size = dpi(32)
+
+theme.widget_pill_top_left     = assets .. 'widget/widget_pill_top_left.png'
+theme.widget_pill_top_right    = assets .. 'widget/widget_pill_top_right.png'
+theme.widget_pill_bottom_left  = assets .. 'widget/widget_pill_bottom_left.png'
+theme.widget_pill_bottom_right = assets .. 'widget/widget_pill_bottom_right.png'
+
+-- Titlebar
+theme.titlebar_size         = nil -- use image width/height
+theme.titlebar_image_top    = assets .. 'titlebar/titlebar_top.png'
+theme.titlebar_image_middle = assets .. 'titlebar/titlebar_middle.png'
+theme.titlebar_image_bottom = assets .. 'titlebar/titlebar_bottom.png'
+theme.titlebar_bgimage_normal = theme.titlebar_middle
+
+-- Titlebar Buttons
+theme.titlebar_button_spacing       = dpi(2.5)
+theme.titlebar_button_margin_left   = dpi(2.5)
+theme.titlebar_button_margin_right  = dpi(3)
+theme.titlebar_button_margin_top    = dpi(3)
+theme.titlebar_button_margin_bottom = dpi(3)
+
+theme.titlebar_button_close                   = assets .. 'titlebar/buttons/button_red.png'
+theme.titlebar_button_close_hover             = assets .. 'titlebar/buttons/button_red_hover.png'
+
+theme.titlebar_button_minimize                = assets .. 'titlebar/buttons/button_yellow.png'
+theme.titlebar_button_minimize_hover          = assets .. 'titlebar/buttons/button_yellow_hover.png'
+
+theme.titlebar_button_maximize_inactive       = assets .. 'titlebar/buttons/button_blue_inactive.png'
+theme.titlebar_button_maximize_inactive_hover = assets .. 'titlebar/buttons/button_blue_inactive_hover.png'
+theme.titlebar_button_maximize_active         = assets .. 'titlebar/buttons/button_blue_active.png'
+theme.titlebar_button_maximize_active_hover   = assets .. 'titlebar/buttons/button_blue_active_hover.png'
+
+theme.titlebar_button_floating_inactive       = assets .. 'titlebar/buttons/button_blue_inactive.png'
+theme.titlebar_button_floating_inactive_hover = assets .. 'titlebar/buttons/button_blue_inactive_hover.png'
+theme.titlebar_button_floating_active         = assets .. 'titlebar/buttons/button_blue_active.png'
+theme.titlebar_button_floating_active_hover   = assets .. 'titlebar/buttons/button_blue_active_hover.png'
+
+theme.titlebar_button_ontop_inactive          = assets .. 'titlebar/buttons/button_blue_inactive.png'
+theme.titlebar_button_ontop_inactive_hover    = assets .. 'titlebar/buttons/button_blue_inactive_hover.png'
+theme.titlebar_button_ontop_active            = assets .. 'titlebar/buttons/button_blue_active.png'
+theme.titlebar_button_ontop_active_hover      = assets .. 'titlebar/buttons/button_blue_active_hover.png'
+
+
+-- Don't touch, it's for semantics
+theme.titlebar_close_button_normal                    = theme.titlebar_button_close
+theme.titlebar_close_button_normal_hover              = theme.titlebar_button_close_hover
+theme.titlebar_close_button_focus                     = theme.titlebar_button_close
+theme.titlebar_close_button_focus_hover               = theme.titlebar_button_close_hover
+
+theme.titlebar_minimize_button_normal                 = theme.titlebar_button_minimize
+theme.titlebar_minimize_button_normal_hover           = theme.titlebar_button_minimize_hover
+theme.titlebar_minimize_button_focus                  = theme.titlebar_button_minimize
+theme.titlebar_minimize_button_focus_hover            = theme.titlebar_button_minimize_hover
+
+theme.titlebar_maximized_button_normal_inactive       = theme.titlebar_button_maximize_inactive
+theme.titlebar_maximized_button_normal_inactive_hover = theme.titlebar_button_maximize_inactive_hover
+theme.titlebar_maximized_button_normal_active         = theme.titlebar_button_maximize_active
+theme.titlebar_maximized_button_normal_active_hover   = theme.titlebar_button_maximize_active_hover
+theme.titlebar_maximized_button_focus_inactive        = theme.titlebar_button_maximize_inactive
+theme.titlebar_maximized_button_focus_inactive_hover  = theme.titlebar_button_maximize_inactive_hover
+theme.titlebar_maximized_button_focus_active          = theme.titlebar_button_maximize_active
+theme.titlebar_maximized_button_focus_active_hover    = theme.titlebar_button_maximize_active_hover
+
+theme.titlebar_floating_button_normal_inactive        = theme.titlebar_button_floating_inactive
+theme.titlebar_floating_button_normal_inactive_hover  = theme.titlebar_button_floating_inactive_hover
+theme.titlebar_floating_button_normal_active          = theme.titlebar_button_floating_active
+theme.titlebar_floating_button_normal_active_hover    = theme.titlebar_button_floating_active_hover
+theme.titlebar_floating_button_focus_inactive         = theme.titlebar_button_floating_inactive
+theme.titlebar_floating_button_focus_inactive_hover   = theme.titlebar_button_floating_inactive_hover
+theme.titlebar_floating_button_focus_active           = theme.titlebar_button_floating_active
+theme.titlebar_floating_button_focus_active_hover     = theme.titlebar_button_floating_active_hover
+
+theme.titlebar_ontop_button_normal_inactive           = theme.titlebar_button_ontop_inactive
+theme.titlebar_ontop_button_normal_inactive_hover     = theme.titlebar_button_ontop_inactive_hover
+theme.titlebar_ontop_button_normal_active             = theme.titlebar_button_ontop_active
+theme.titlebar_ontop_button_normal_active_hover       = theme.titlebar_button_ontop_active_hover
+theme.titlebar_ontop_button_focus_inactive            = theme.titlebar_button_ontop_inactive
+theme.titlebar_ontop_button_focus_inactive_hover      = theme.titlebar_button_ontop_inactive_hover
+theme.titlebar_ontop_button_focus_active              = theme.titlebar_button_ontop_active
+theme.titlebar_ontop_button_focus_active_hover        = theme.titlebar_button_ontop_active_hover
+return theme
diff --git a/themes/pixelos/assets.bck/titlebar/titlebar_bottom.png b/themes/pixelos/assets.bck/titlebar/titlebar_bottom.png
deleted file mode 100644
index 7141578..0000000
Binary files a/themes/pixelos/assets.bck/titlebar/titlebar_bottom.png and /dev/null differ
diff --git a/themes/pixelos/assets.bck/titlebar/titlebar_middle.png b/themes/pixelos/assets.bck/titlebar/titlebar_middle.png
deleted file mode 100644
index d7c3ea0..0000000
Binary files a/themes/pixelos/assets.bck/titlebar/titlebar_middle.png and /dev/null differ
diff --git a/themes/pixelos/assets.bck/titlebar/titlebar_top.png b/themes/pixelos/assets.bck/titlebar/titlebar_top.png
deleted file mode 100644
index b9fb7fe..0000000
Binary files a/themes/pixelos/assets.bck/titlebar/titlebar_top.png and /dev/null differ
diff --git a/themes/pixelos/assets.bck/wallpaper/wallpaper1.png b/themes/pixelos/assets.bck/wallpaper/wallpaper1.png
deleted file mode 100644
index b3514cb..0000000
Binary files a/themes/pixelos/assets.bck/wallpaper/wallpaper1.png and /dev/null differ
diff --git a/themes/pixelos/assets.bck/wallpaper/wallpaper2.jpg b/themes/pixelos/assets.bck/wallpaper/wallpaper2.jpg
deleted file mode 100644
index 67a9d38..0000000
Binary files a/themes/pixelos/assets.bck/wallpaper/wallpaper2.jpg and /dev/null differ
diff --git a/themes/pixelos/assets.bck/wallpaper/wallpaper3.jpg b/themes/pixelos/assets.bck/wallpaper/wallpaper3.jpg
deleted file mode 100644
index a5ca0eb..0000000
Binary files a/themes/pixelos/assets.bck/wallpaper/wallpaper3.jpg and /dev/null differ
diff --git a/themes/pixelos/assets.bck/wallpaper/wallpaper4.jpg b/themes/pixelos/assets.bck/wallpaper/wallpaper4.jpg
deleted file mode 100644
index e4a416d..0000000
Binary files a/themes/pixelos/assets.bck/wallpaper/wallpaper4.jpg and /dev/null differ