diff --git a/config/mako b/config/mako
index 8fc3870..c0d5ea9 100644
--- a/config/mako
+++ b/config/mako
@@ -6,6 +6,17 @@ anchor=bottom-right
 background-color=#0E423C
 border-color=#FFFFFF
 default-timeout=4000
+font=Letter
+
+[urgency=low]
+border-color=#cccccc
+
+[urgency=normal]
+border-color=#d08770
+
+[urgency=high]
+border-color=#bf616a
+default-timeout=0
 
 [category=byMe]
 anchor=top-center
diff --git a/config/sway b/config/sway
index 411cdc0..3670cb5 100644
--- a/config/sway
+++ b/config/sway
@@ -33,8 +33,8 @@ exec_always ~/.scripts/idle.sh
 # Set warm colours at night
 exec ~/.scripts/wlsunset.sh
 
-exec nm-applet --indicator
-exec blueman-applet
+# exec nm-applet --indicator
+# exec blueman-applet
 
 focus_follows_mouse no
 
@@ -248,12 +248,11 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ to
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
 # Lockscreen
-set $lock "swaylock -f --screenshots --clock --indicator --fade-in 0.2 --effect-blur 5x5"
-bindsym $winkey+Delete exec --no-startup-id $lock
+bindsym $winkey+Delete exec --no-startup-id swaylock
 
 set $mode_system System (l) lock, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
 mode "$mode_system" {
-	bindsym l exec --no-startup-id $lock; mode "default"
+	bindsym l exec --no-startup-id swaylock; mode "default"
 	bindsym s exec --no-startup-id systemctl suspend; mode "default"
 	bindsym h exec --no-startup-id systemctl hibernate; mode "default"
 	bindsym r exec --no-startup-id systemctl reboot; mode "default"
@@ -285,10 +284,11 @@ bindsym Print mode "$mode_screenshot"
 # Styling
 # =======
 
+font pango:monospace 2
+
 bar {
 	swaybar_command /usr/bin/waybar	
 	mode hide
-	position bottom
 }
 
 # Notifications manager
@@ -296,17 +296,18 @@ exec mako
 
 title_align center
 default_border pixel 2
-# default_floating_border normal 2
+default_floating_border normal 2
 hide_edge_borders both
 
 # Toggle Show title
 bindsym $alt+Next border pixel 2
 bindsym $alt+Prior border normal 2
 
-# Class			border	backgr	text	indic.	child_border
-client.focused          #000000 #00897b #ffffff #00897b   #000000
-client.focused_inactive #000000 #222222 #888888 #484e50   #000000
-client.unfocused        #000000 #222222 #888888 #292d2e   #000000
+# Mimic no titles
+# Classi    			border	backgr	text	indic.	child_border
+client.focused          #000000 #00897b #00897b #00897b   #000000
+client.focused_inactive #000000 #222222 #484e50 #484e50   #000000
+client.unfocused        #000000 #222222 #292d2e #292d2e   #000000
 
 exec gsettings set org.gnome.desktop.interface icon-theme 'Win11-black-dark'
 exec gsettings set org.gnome.desktop.interface gtk-theme 'Nordic'
diff --git a/config/waybar-config b/config/waybar-config
index c3ea940..a0043c0 100644
--- a/config/waybar-config
+++ b/config/waybar-config
@@ -3,21 +3,24 @@
 //
 
 [{
-    "position": "bottom",
-	"height": 30,
+    "position": "top",
+	"height": 25,
 	"spacing": 4, 
-	
+    "margin": "-25px 0 0 0",
+
 	"modules-left": ["sway/workspaces", "custom/media"],
-	"modules-right": ["idle_inhibitor", "cpu", "memory", "disk", "temperature", "pulseaudio", "battery", "tray"],
-	
-	"ipc": true,
+	"modules-right": ["idle_inhibitor", "disk", "memory", "cpu", "temperature", "pulseaudio", "battery", "tray"],
     
+
+    "mode": "hide",
+	"ipc": true,
+
 	"sway/workspaces": {
 	    "disable-scroll": true,
 		"all-outputs": true,
 		"format": "{icon}{name}",
 		"format-icons": {
-		    "urgent": " ",
+		    "urgent": "\uf071 ",
 			"default": "" // Prevent showing workspace name literal. 
 		},
 	},
@@ -26,58 +29,61 @@
 	    "return-type": "json",
 	    "max-length": 40,
 	    "format-icons": {
-	        "spotify": "",
-	        "default": "🎜"
+	        "spotify": "\uf1bc",
+	        "default": "\uf51f"
 	    },
 	    "escape": true,
 	    "exec": "~/.config/waybar/mediaplayer.py 2> /dev/null", // Script in resources folder
+        "on-click": "playerctl play-pause",
 	},
 
 
 	"idle_inhibitor": {
-        "format": "Prohibit idle {icon}",
+        "format": "{icon}",
 	    "format-icons": {
-            "activated": "",
-		    "deactivated": ""
+            "activated": "\uf06e",
+		    "deactivated": "\uf070"
 		}, 
 		"tooltip": false,
 	},
-	"cpu": {
-        "format": "{usage}% ",
-	    "tooltip": true,
-	},
-	"memory": {
-        "format": "{}% ",
-	},
 	"disk": {
         "interval": 30, 
-        "format": "{percentage_free}% ({free}) 💾", 
+        "format": "{percentage_free}% ({free}) \uf0a0", 
         "path": "/",
+        "on-click": "alacritty -e ncdu /",
     },
+	"memory": {
+        "format": "{}% \uf1c0",
+        "on-click": "alacritty -e htop",
+	},
+	"cpu": {
+        "format": "{usage}% \uf2db",
+	    "tooltip": true,
+        "on-click": "alacritty -e htop",
+	},
 	"temperature": {
 	    "critical-threshold": 70,
 	    // "format-critical": "{temperatureC}°C {icon}",
 	    "format": "{temperatureC}°C {icon}",
-	    "format-icons": ["", "", ""],
+	    "format-icons": ["\uf2cb", "\uf2c9", "\uf2c7"],
 	},
 	"pulseaudio": {
         "scroll-step": 2,
 	    "format": "{volume}% {icon} {format_source}",
-	    "format-bluetooth": "{volume}% {icon} {format_source}",
-	    "format-bluetooth-muted": " {icon} {format_source}",
-	    "format-muted": " {format_source}",
-	    "format-source": "{volume}% ",
-	    "format-source-muted": "",
+	    "format-bluetooth": "{volume}% {icon}\uf294 {format_source}",
+	    "format-bluetooth-muted": "\uf6a9 {icon}\uf294 {format_source}",
+	    "format-muted": "\uf6a9 {format_source}",
+	    "format-source": "{volume}% \uf130",
+	    "format-source-muted": "\uf131",
 	    "format-icons": {
-		    "headphone": " ",
-    		"hands-free": "",
-    		"headset": "",
-    		"phone": "",
-    		"portable": "",
-    		"car": "",
-			"default": ["", "", ""]
+		    "headphone": "\uf58f",
+    		"hands-free": "\uf590",
+    		"headset": "\uf590",
+    		"phone": "\uf3ce",
+    		"portable": "\uf3ce",
+    		"car": "\uf1b9",
+			"default": ["\uf026", "\uf027", "\uf028 "]
 		},
-		// "on-click": "playerctl play-pause",
         "on-click": "pavucontrol",
 	},
 	"battery": {
@@ -86,12 +92,12 @@
 		    "critical": 15
     	},
 	    "format": "{capacity}% {icon}",
-	    "format-charging": "{capacity}% ",
-	    "format-plugged": "{capacity}% ",
 	    "format-alt": "{time} {icon}",
+	    "format-charging": "{capacity}% \uf0e7 {icon}",
+	    "format-plugged": "{capacity}% \ue55c",
 	    // "format-good": "", // An empty format will hide the module
 	    // "format-full": "",
-	    "format-icons": ["", "", "", "", ""],
+	    "format-icons": ["\uf244", "\uf243", "\uf242", "\uf241", "\uf240"],
 	},
 	"tray": {
         //	"icon-size": 21,
@@ -101,15 +107,19 @@
 
 {
     "position": "top",
-    "height": 20,
+    "height": 25,
 	"modules-left": ["sway/mode"],
     "modules-center": ["sway/window"],
     "modules-right": ["clock"],
-    
+
+    "sway/window": {
+        "max-length": 85,
+    },
+
     "clock": {
         "timezone": "Europe/Brussels",
 	    "format": "{:%H:%M}",
-		"format-alt": "{:%H:%M %d/%m/%Y}", //"<big>{:%H:%M}</big>\n21-03-2022", //\n{:%d/%m/%Y}",
+		"format-alt": "{:%d/%m/%Y %H:%M}", //"<big>{:%H:%M}</big>\n21-03-2022", //\n{:%d/%m/%Y}",
 	    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
 	},
 }]
diff --git a/config/waybar-style.css b/config/waybar-style.css
index c5e54a1..1e961cc 100644
--- a/config/waybar-style.css
+++ b/config/waybar-style.css
@@ -10,17 +10,12 @@
 }
 
 window#waybar {
-    background-color: rgba(43, 48, 59, 0.75);
+    background-color: transparent;
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
 }
 
-/* Top bar which only contains title can be transparent */
-window#waybar.top {
-	background-color: transparent; 
-}
-
 window#waybar.hidden {
     opacity: 0.2;
 }
@@ -34,35 +29,27 @@ window#waybar.solo {
 }
 */
 
-window#waybar.termite {
-    background-color: #3F3F3F;
-}
-
 window#waybar.chromium {
-    background-color: #000000;
     border: none;
 }
 
 #workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
+    padding: 0 10px;
+    margin: -15px 5px;
     color: #ffffff;
     /* Use box-shadow instead of border so the text isn't offset */
     /* Avoid rounded borders under each workspace name */
     border: none;
-    border-radius: 0;
     min-width: 30px; 
 }
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
-    box-shadow: inset 0 3px #ffffff;
+    background: rgba(0, 0, 0, 0.9);
 }
 
 #workspaces button.focused {
     background-color: #0E423C; /* REPLACE */
-    box-shadow: inset 0 3px #ffffff; 
 }
 
 #workspaces button.urgent {
@@ -70,11 +57,13 @@ window#waybar.chromium {
 }
 
 #mode {
-    background-color: #64727D;
     border-bottom: 3px solid #ffffff;
 }
 
-#clock,
+#clock {
+    margin: 0 10px;
+}
+
 #battery,
 #cpu,
 #memory,
diff --git a/config/zshell-theme b/config/zshell-theme
index 469c667..30ac3aa 100644
--- a/config/zshell-theme
+++ b/config/zshell-theme
@@ -10,7 +10,7 @@ zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
 zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
 zstyle ':vcs_info:*' actionformats '%F{5}(%F{2}%b%F{3}|%F{1}%a%c%u%m%F{5})%f '
-zstyle ':vcs_info:*' formats '%F{white}(%F{cyan}%b%c%u%m%F{white})%f '
+zstyle ':vcs_info:*' formats "%F{white}(%F{cyan} %b%c%u%m%F{white})%f "
 zstyle ':vcs_info:svn:*' branchformat '%b'
 zstyle ':vcs_info:svn:*' actionformats '%F{5}(%F{2}%b%F{1}:%{3}%i%F{3}|%F{1}%a%c%u%m%F{5})%f '
 zstyle ':vcs_info:svn:*' formats '%F{5}(%F{2}%b%F{1}:%F{3}%i%c%u%m%F{5})%f '
@@ -34,7 +34,7 @@ add-zsh-hook precmd loadgit
 
 # Backup line
 # PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%F{blue}%(!.#.$)%k%b%f '
-PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %{$reset_color%}%F{cyan}%c %B${vcs_info_msg_0_}%F{green}%(!.#.$)%k%b%f '
+PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %{$reset_color%}%F{cyan}%c %B${vcs_info_msg_0_}%F{green}%(!.#. )%k%b%f '
 
 # PROMPT='%{$fg_bold[green]%}[%n@%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%}$(git_prompt_info)%{$fg_bold[green]%}]%{$reset_color%}$ '