diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 3d0cc74..9732076 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -8,6 +8,9 @@ call plug#begin()
 " theme
 Plug 'altercation/vim-colors-solarized'
 
+" razer
+Plug 'https://github.com/DanManN/vim-razer'
+
 " completion
 " TODO: REMOVE ALL OUR CUSTOM COMPLETIONS AND USE LANGUAGE SERVER
 " TODO: CHOOSE LINTING AND FORMATTING TOOLS
diff --git a/.config/sway/config b/.config/sway/config
index 9604602..6481895 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -78,6 +78,9 @@ input * {
 input type:touchpad {
     natural_scroll enabled
 }
+input type:pointer {
+    natural_scroll enabled
+}
 
 ### Key bindings
 #
diff --git a/.config/waybar/config b/.config/waybar/config
index 9ba0ab1..f9b0ce4 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -4,9 +4,9 @@
     "height": 26, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
-    "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "idle_inhibitor", "network", "cpu", "memory", "temperature", "backlight", "clock", "tray"],
+    "modules-left": ["sway/workspaces", "sway/mode", "custom/media", "sway/window"],
+    "modules-center": [],
+    "modules-right": ["pulseaudio", "idle_inhibitor", "network", "cpu", "memory", "temperature", "battery", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -66,15 +66,16 @@
     "clock": {
         // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+		"format": "{:%H:%M}",
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{usage}% ",
-        "format-alt": "{usage}%"
+        "format": "{usage}%",
+        "format-alt": "{usage}% "
     },
     "memory": {
-        "format": "{}% ",
-        "format-alt": "{}%"
+        "format": "{}%",
+        "format-alt": "{}% "
     },
     "temperature": {
         // "thermal-zone": 2,
@@ -109,14 +110,19 @@
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ipaddr}"
+        //"format-wifi": "{essid} ({signalStrength}%) ",
+        //"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+        //"format-linked": "{ifname} (No IP) ",
+        //"format-disconnected": "Disconnected ⚠",
+        "format-wifi": "{essid} ({signalStrength}%)",
+        "format-ethernet": "{ifname}: {ipaddr}/{cidr}",
+        "format-linked": "{ifname} (No IP)",
+        "format-disconnected": "⚠",
+        "format-alt": "{ipaddr}",
+        "on-click": "XDG_CURRENT_DESKTOP=GNOME gnome-control-center network"
     },
     "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
+        "scroll-step": 1, // %, can be a float
         "format": "{volume}% {icon} {format_source}",
         "format-bluetooth": "{volume}% {icon} {format_source}",
         "format-bluetooth-muted": " {icon} {format_source}",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index f45bde9..635bc68 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -2,14 +2,14 @@
     border: none;
     border-radius: 0;
     /* `otf-font-awesome` is required to be installed for icons */
-	font-family: "IBM Plex Sans";
+	font-family: "Fira Code";
     font-size: 13px;
     min-height: 0;
 }
 
 window#waybar {
     background-color: rgba(43, 48, 59, 0.5);
-    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    border-bottom: 0px solid rgba(100, 114, 125, 0.5);
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
@@ -66,6 +66,8 @@ window#waybar.chromium {
 }
 
 #window {
+	padding: 0 10px;
+	margin: 0 4px;
 }
 
 #clock,
diff --git a/.config/wofi/style.css b/.config/wofi/style.css
index 07e6c36..465ba8b 100644
--- a/.config/wofi/style.css
+++ b/.config/wofi/style.css
@@ -2,6 +2,8 @@
 	border: none;
 	background: rgba(32, 32, 32, 0.875);
 	color: #999;
+	font-family: "Fira Code";
+	font-size: 13px;
 }
 
 #input {
diff --git a/.local/bin/wofi_run b/.local/bin/wofi_run
index d90438d..cef2f71 100755
--- a/.local/bin/wofi_run
+++ b/.local/bin/wofi_run
@@ -1,6 +1,7 @@
 #!/bin/zsh
 
 export PATH="$PATH:$HOME/.local/bin"
+export MOZ_ENABLE_WAYLAND=1
 cd ~
 
 wofi \
@@ -12,7 +13,12 @@ wofi \
 	--matching contains \
 	--insensitive \
 	--term kitty \
+	--define always_parse_args=true \
 	--show drun,run
 
+# REMOVED:
+#	--exec-search \
+
 # TIPS:
 # - Hold shift to open in terminal
+# - Hold control to run with arguments