diff --git a/share/dotfiles/.config/hypr/conf/windowrules/default.conf b/share/dotfiles/.config/hypr/conf/windowrules/default.conf
index 811113f12..a8b0f1fce 100644
--- a/share/dotfiles/.config/hypr/conf/windowrules/default.conf
+++ b/share/dotfiles/.config/hypr/conf/windowrules/default.conf
@@ -9,6 +9,7 @@ windowrule = float,^(pavucontrol)$
 windowrule = float,^(blueman-manager)$
 windowrule = float,^(nm-connection-editor)$
 windowrule = float,^(qalculate-gtk)$
+windowrule = float,^(nwg-look)$
 
 # Browser Picture in Picture
 windowrulev2 = float, title:^(Picture-in-Picture)$
diff --git a/share/dotfiles/.config/hypr/scripts/gtk.sh b/share/dotfiles/.config/hypr/scripts/gtk.sh
index 5229899aa..e0ada8d2b 100755
--- a/share/dotfiles/.config/hypr/scripts/gtk.sh
+++ b/share/dotfiles/.config/hypr/scripts/gtk.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 #   _____________ __
 #  / ___/_  __/ //_/
-# / (_ / / / / ,<   
-# \___/ /_/ /_/|_|  
-#                   
+# / (_ / / / / ,<
+# \___/ /_/ /_/|_|
+#
 # Source: https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
 
 # Check that settings file exists
@@ -50,4 +50,4 @@ fi
 # Update gsettings for open any terminal
 gsettings set com.github.stunkymonkey.nautilus-open-any-terminal terminal "$terminal"
 gsettings set com.github.stunkymonkey.nautilus-open-any-terminal use-generic-terminal-name "true"
-gsettings set com.github.stunkymonkey.nautilus-open-any-terminal keybindings "<Ctrl><Alt>t"
\ No newline at end of file
+gsettings set com.github.stunkymonkey.nautilus-open-any-terminal keybindings "<Ctrl><Alt>t"
diff --git a/share/dotfiles/.config/hypr/scripts/wallpaper.sh b/share/dotfiles/.config/hypr/scripts/wallpaper.sh
index cd875abae..f68414424 100755
--- a/share/dotfiles/.config/hypr/scripts/wallpaper.sh
+++ b/share/dotfiles/.config/hypr/scripts/wallpaper.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-#  _      __     ____                      
+#  _      __     ____
 # | | /| / /__ _/ / /__  ___ ____  ___ ____
 # | |/ |/ / _ `/ / / _ \/ _ `/ _ \/ -_) __/
-# |__/|__/\_,_/_/_/ .__/\_,_/ .__/\__/_/   
-#                /_/       /_/             
+# |__/|__/\_,_/_/_/ .__/\_,_/ .__/\__/_/
+#                /_/       /_/
 # -----------------------------------------------------
 # Check to use wallpaper cache
 # -----------------------------------------------------
diff --git a/share/dotfiles/.config/ml4w/scripts/updates.sh b/share/dotfiles/.config/ml4w/scripts/updates.sh
index b2674903a..ee33e7bb6 100755
--- a/share/dotfiles/.config/ml4w/scripts/updates.sh
+++ b/share/dotfiles/.config/ml4w/scripts/updates.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
-#  _   _           _       _             
-# | | | |_ __   __| | __ _| |_ ___  ___  
-# | | | | '_ \ / _` |/ _` | __/ _ \/ __| 
-# | |_| | |_) | (_| | (_| | ||  __/\__ \ 
-#  \___/| .__/ \__,_|\__,_|\__\___||___/ 
-#       |_|                              
-#  
+#  _   _           _       _
+# | | | |_ __   __| | __ _| |_ ___  ___
+# | | | | '_ \ / _` |/ _` | __/ _ \/ __|
+# | |_| | |_) | (_| | (_| | ||  __/\__ \
+#  \___/| .__/ \__,_|\__,_|\__\___||___/
+#       |_|
+#
 
 script_name=$(basename "$0")
 
@@ -16,10 +16,9 @@ if [ $instance_count -gt 1 ]; then
     sleep $instance_count
 fi
 
-
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Define threshholds for color indicators
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 
 threshhold_green=0
 threshhold_yellow=25
@@ -31,9 +30,9 @@ case $install_platform in
     arch)
         aur_helper="$(cat ~/.config/ml4w/settings/aur.sh)"
 
-        # ----------------------------------------------------- 
+        # -----------------------------------------------------
         # Calculate available updates
-        # ----------------------------------------------------- 
+        # -----------------------------------------------------
 
         # flatpak remote-ls --updates
 
@@ -52,18 +51,18 @@ case $install_platform in
         check_lock_files
 
         updates=$(checkupdates-with-aur | wc -l)
-    ;;
+        ;;
     fedora)
         updates=$(dnf check-update -q | grep -c ^[a-z0-9])
-    ;;
+        ;;
     *)
         updates=0
-    ;;
+        ;;
 esac
 
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 # Output in JSON format for Waybar Module custom-updates
-# ----------------------------------------------------- 
+# -----------------------------------------------------
 
 css_class="green"
 
diff --git a/share/dotfiles/.config/nwg-dock-hyprland/launch.sh b/share/dotfiles/.config/nwg-dock-hyprland/launch.sh
index e94ca09a9..ded789ddb 100755
--- a/share/dotfiles/.config/nwg-dock-hyprland/launch.sh
+++ b/share/dotfiles/.config/nwg-dock-hyprland/launch.sh
@@ -12,7 +12,7 @@ if [ ! -f $HOME/.config/ml4w/settings/dock-disabled ]; then
     else
         style="style-dark.css"
     fi
-    nwg-dock-hyprland -i 32 -w 5 -mb 10 -ml 10 -mr 10 -x -s $style -c  "rofi -show drun"
+    nwg-dock-hyprland -i 32 -w 5 -mb 10 -ml 10 -mr 10 -x -s $style -c "rofi -show drun"
 else
     echo ":: Dock disabled"
 fi
diff --git a/share/dotfiles/.config/zshrc/20-customization b/share/dotfiles/.config/zshrc/20-customization
index be4a13911..3956e5975 100644
--- a/share/dotfiles/.config/zshrc/20-customization
+++ b/share/dotfiles/.config/zshrc/20-customization
@@ -28,21 +28,35 @@ plugins=(
 source $ZSH/oh-my-zsh.sh
 
 # -----------------------------------------------------
-# Set-up FZF key bindings (CTRL R for fuzzy history finder)
+# Prompt
 # -----------------------------------------------------
-source <(fzf --zsh)
+# eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/zen.toml)"
+eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/EDM115-newline.omp.json)"
+
+# Shipped Theme
+# eval "$(oh-my-posh init zsh --config /usr/share/oh-my-posh/themes/agnoster.omp.json)"
+
+# Keybindings
+bindkey -e
+bindkey '^p' history-search-backward
+bindkey '^n' history-search-forward
+bindkey '^[w' kill-region
 
-# zsh history
+# History
 HISTFILE=~/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
 setopt appendhistory
+setopt sharehistory
+setopt hist_ignore_space
+setopt hist_ignore_all_dups
+setopt hist_save_no_dups
+setopt hist_ignore_dups
+setopt hist_find_no_dups
+
+zle_highlight+=(paste:none)
 
 # -----------------------------------------------------
-# Prompt
+# Set-up FZF key bindings (CTRL R for fuzzy history finder)
 # -----------------------------------------------------
-# eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/zen.toml)"
-eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/EDM115-newline.omp.json)"
-
-# Shipped Theme
-# eval "$(oh-my-posh init zsh --config /usr/share/oh-my-posh/themes/agnoster.omp.json)"
+eval "$(fzf --zsh)"