diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini
index 5b389be..7004d3f 100644
--- a/config/gtk-3.0/settings.ini
+++ b/config/gtk-3.0/settings.ini
@@ -1,23 +1,23 @@
 [Settings]
 gtk-application-prefer-dark-theme=true
-gtk-button-images=1
+gtk-button-images=true
 gtk-cursor-blink=true
 gtk-cursor-blink-time=1000
-gtk-cursor-theme-name=Qogir-dark
+gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=24
 gtk-decoration-layout=icon:minimize,maximize,close
 gtk-enable-animations=true
 gtk-enable-event-sounds=0
 gtk-enable-input-feedback-sounds=0
 gtk-font-name=Noto Sans,  10
-gtk-icon-theme-name=Gruvbox_Dark
-gtk-menu-images=1
+gtk-icon-theme-name=breeze-dark
+gtk-menu-images=true
 gtk-modules=colorreload-gtk-module
 gtk-primary-button-warps-slider=true
 gtk-sound-theme-name=ocean
 gtk-theme-name=Gruvbox-Dark-BL
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
+gtk-toolbar-style=3
 gtk-xft-antialias=1
 gtk-xft-dpi=122880
 gtk-xft-hinting=1
diff --git a/config/local-templates/profile.local b/config/local-templates/profile.local
index 908182e..8fdef33 100644
--- a/config/local-templates/profile.local
+++ b/config/local-templates/profile.local
@@ -1,3 +1,4 @@
 NO_NEOFETCH=1
 NO_GIT_CHECK=1
 NO_ZSH_COWSAY=1
+LOAD_SSH_KEYS=0
diff --git a/config/profile b/config/profile
index 76b21a6..342c22b 100644
--- a/config/profile
+++ b/config/profile
@@ -96,22 +96,24 @@ export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"
 
 # Make sure ssh-agent is available 
-if program_installed ssh-add && [ ! -z "$SSH_AUTH_SOCK" ] && [ -d "$SSH_AUTH_SOCK" ] > /dev/null 2&>1 ; then
-    # Add SSH keys to agent if not already added
-    ## Find existing keys, supporting one layer of folder organization
-    public_keys=($(find "$HOME/.ssh/" -maxdepth 2 -name "*.pub"))
-    if [ ${#public_keys[@]} -gt 0 ]; then
-        for public_key in "${public_keys[@]}"; do
-            if [[ $(uname -s) == Linux* ]]; then
-                # Add SSH keys only if not already present
-                ssh-add -l | grep -q `ssh-keygen -lf "$public_key"  | awk '{print $2}'` || ssh-add -k
-                break
-            elif [[ $(uname -s) == Darwin* ]]; then
-                # Add SSH keys only if not already present
-                ssh-add -l | grep -q `ssh-keygen -lf "$public_key"  | awk '{print $2}'` || ssh-add --apple-use-keychain
-                break
-            fi
-        done
+if [ -n "$LOAD_SSH_KEYS" ] && [ "$LOAD_SSH_KEYS" -eq 1 ]; then
+    if program_installed ssh-add && [ ! -z "$SSH_AUTH_SOCK" ] && [ -d "$SSH_AUTH_SOCK" ] > /dev/null 2&>1 ; then
+        # Add SSH keys to agent if not already added
+        ## Find existing keys, supporting one layer of folder organization
+        public_keys=($(find "$HOME/.ssh/" -maxdepth 2 -name "*.pub"))
+        if [ ${#public_keys[@]} -gt 0 ]; then
+            for public_key in "${public_keys[@]}"; do
+                if [[ $(uname -s) == Linux* ]]; then
+                    # Add SSH keys only if not already present
+                    ssh-add -l | grep -q `ssh-keygen -lf "$public_key"  | awk '{print $2}'` || ssh-add -k
+                    break
+                elif [[ $(uname -s) == Darwin* ]]; then
+                    # Add SSH keys only if not already present
+                    ssh-add -l | grep -q `ssh-keygen -lf "$public_key"  | awk '{print $2}'` || ssh-add --apple-use-keychain
+                    break
+                fi
+            done
+        fi
     fi
 fi
 
diff --git a/config/zshrc b/config/zshrc
index 167a9d8..5dedcf7 100755
--- a/config/zshrc
+++ b/config/zshrc
@@ -212,7 +212,7 @@ if program_installed pyenv; then
 fi
 
 # oh-my-zsh plugins (must come after all initialization above)
-plugins=(archlinux colored-man-pages colorize command-not-found cp docker docker-compose fzf git history history-substring-search nmap npm pip poetry pyenv macos rsync snap ssh ssh-agent sudo systemd terraform thefuck tmux tmuxinator vi-mode virtualenv yarn zsh-interactive-cd zsh-navigation-tools)
+plugins=(archlinux colored-man-pages colorize command-not-found cp docker docker-compose fzf git history history-substring-search nmap npm pip poetry pyenv macos rsync snap ssh sudo systemd terraform thefuck tmux tmuxinator vi-mode virtualenv yarn zsh-interactive-cd zsh-navigation-tools)
 
 # Local overrides
 if [ -f $HOME/.zshrc_local ]; then