diff --git a/.config/compton.conf b/.config/compton.conf
index f85567b1..00a91353 100644
--- a/.config/compton.conf
+++ b/.config/compton.conf
@@ -56,7 +56,7 @@ glx-swap-method = "undefined";
 #################################
 
 # Enabled client-side shadows on windows.
-shadow = true;
+shadow = false;
 # Don't draw shadows on DND windows.
 no-dnd-shadow = true;
 # Avoid drawing shadows on dock/panel windows.
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 7eb2a4ba..2bffcd6a 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "400x5-8-36"
+    geometry = "400x5-0-34"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -51,7 +51,7 @@
     # Draw a line of "separator_height" pixel height between two
     # notifications.
     # Set to 0 to disable.
-    separator_height = 1
+    separator_height = 4
 
     # Padding between text and separator.
     padding = 8
@@ -61,11 +61,11 @@
 
     # Defines width in pixels of frame around the notification window.
     # Set to 0 to disable.
-    frame_width = 3
+    frame_width = 4
 
     # Defines color of the frame around the notification window.
     #frame_color = "#aaaaaa"
-     frame_color = "#1d2021"
+     frame_color = "#32302f"
 
     # Define a color for the separator.
     # possible values are:
@@ -125,7 +125,7 @@
     #   %p  progress value if set ([  0%] to [100%]) or nothing
     #   %n  progress value if set without any extra characters
     # Markup is allowed
-    format = "<b>%s</b>: %a\n\n%b\n<i>Alt + Shift + Space to dismiss</i>\n<i>Alt + Shift + O for options</i>"
+    format = "<b>%s</b> (%a)\n%b"
 
     # Alignment of message text.
     # Possible values are "left", "center" and "right".
@@ -241,21 +241,21 @@
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#1d2021"
+    background = "#282828"
     foreground = "#a89984"
     timeout = 10
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_normal]
-    background = "#1d2021"
+    background = "#282828"
     foreground = "#ebdbb2"
     timeout = 10
     # Icon for notifications with normal urgency, uncomment to enable
     #icon = /path/to/icon
 
 [urgency_critical]
-    background = "#1d2021"
+    background = "#282828"
     foreground = "#fb4934"
     frame_color = "#cc241d"
     timeout = 0
diff --git a/.config/i3/config b/.config/i3/config
index 6e15e6d6..5befa8d4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -7,11 +7,11 @@
 ###################
 
 # Titlebar and borders
-new_window pixel 2
-for_window [class=".*"] border pixel 2
+new_window pixel 4
+for_window [class=".*"] border pixel 4
 
 # i3-gaps configs
-gaps inner 16
+gaps inner 24
 gaps outer 0
 
 # Set up our colors
@@ -39,9 +39,9 @@ set_from_resource $fg color15 #ebdbb2
 
 # Apply colors to i3
 #	<colorclass>			<border>	<backgrd>	<text>		<indicator>	<child_border>
-	client.focused			$blue2		$blue2 		$bg		$bg_soft	$blue2
-	client.focused_inactive		$blue		$blue		$bg		$bg_soft	$bg_soft
-	client.unfocused		$bg		$bg		$blue		$bg		$bg_soft
+	client.focused			$blue2		$blue2 		$bg		$bgm	$blue2
+	client.focused_inactive		$blue		$blue		$bg		$bgm	$bgm
+	client.unfocused		$bg		$bg		$blue		$bg		$bgm
 	client.urgent			$yellow2	$bg		$yellow2	$yellow		$bg
 	client.placeholder		$purple2	$bg		$purple2	$purple		$bg
 	client.background		$bg
@@ -60,7 +60,7 @@ exec_always --no-startup-id "killall polybar; sleep 1; polybar -r gamma"
 exec --no-startup-id "redshift"
 exec_always --no-startup-id "compton --config ~/.config/compton.conf"
 exec_always --no-startup-id "dunst"
-exec_always --no-startup-id "feh --randomize --bg-fill ~/Pictures/Wallpapers/i3"
+exec_always --no-startup-id "feh --randomize --bg-tile ~/Pictures/Wallpapers/i3"
 exec_always --no-startup-id "xfce4-power-manager"
 exec --no-startup-id "xfce4-volumed-pulse"
 exec_always --no-startup-id "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
diff --git a/.config/polybar/config b/.config/polybar/config
index e8d96fe7..6c41e172 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -59,7 +59,7 @@ font-4 =
 [template/bar]
 # Rendering of the bar
 width = 100%
-height = 28
+height = 30
 
 # Module padding and spacing
 padding = 2
@@ -84,6 +84,7 @@ font-4 = ${res/fonts.font-4}
 #====================
 [bar/alpha]
 inherit = template/bar
+monitor = eDP1
 bottom = true
 tray-position = right
 
@@ -100,11 +101,15 @@ monitor = eDP1
 bottom = true
 tray-position = right
 
-background = #001d2021
+padding = 1
+
+overline-size = 4
+border-size = 4
+border-color = ${res/colors.background-2}
 
 modules-left = i3 bspwm | 
 modules-center = xwindow-label
-modules-right = | temperature-label-alert mpd-mini wlan-network-mini volume-ramp-mini battery-ramp-mini | weather-mini date-mini
+modules-right = | temperature-label-alert mpd-mini | temperature-label-alert weather-mini wlan-network-mini volume-ramp-mini battery-ramp-mini | date-mini
 
 #========================================
 # MODULES
@@ -114,8 +119,9 @@ modules-right = | temperature-label-alert mpd-mini wlan-network-mini volume-ramp
 #====================
 [module/|]
 type = custom/text
-content = |
+content = " "
 content-foreground = ${res/colors.foreground}
+content-background = ${res/colors.background-2}
 
 # CUSTOM
 #====================
@@ -181,12 +187,14 @@ label-mode-background = ${res/colors.primary}
 # Active workspace on focused monitor
 label-focused = %name%
 label-focused-padding = ${self.label-mode-padding}
-label-focused-overline = ${res/colors.primary}
+label-focused-foreground = ${res/colors.background}
+label-focused-background = ${res/colors.primary}
 
 # Active workspace on unfocused monitor
 label-visible = ${self.label-focused}
 label-visible-padding = ${self.label-focused-padding}
-label-visible-overline = ${res/colors.primary-dark}
+label-visible-foreground = ${self.label-focused-foreground}
+label-visible-background = ${res/colors.primary-dark}
 
 # Inactive workspace
 label-unfocused = ${self.label-focused}
@@ -195,7 +203,8 @@ label-unfocused-padding = ${self.label-focused-padding}
 # Urgent workspace
 label-urgent = ${self.label-focused}
 label-urgent-padding = ${self.label-focused-padding}
-label-urgent-overline = ${res/colors.alert}
+label-urgent-foreground = ${self.label-focused-foreground}
+label-urgent-background = ${res/colors.alert}
 
 [module/bspwm]
 inherit = template/module