diff --git a/i3/catpuccin b/i3/catpuccin
new file mode 100644
index 0000000..98192f2
--- /dev/null
+++ b/i3/catpuccin
@@ -0,0 +1,22 @@
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
+
+# bar
+# bar {
+#   colors {
+#     background         $base
+#     statusline         $text
+#     focused_statusline $text
+#     focused_separator  $base
+#     focused_workspace  $base $base $green
+#     active_workspace   $base $base $blue
+#     inactive_workspace $base $base $surface1
+#     urgent_workspace   $base $base $surface1
+#     binding_mode       $base $base $surface1
+#   }
+# }
diff --git a/i3/catpuccin-macchiato b/i3/catpuccin-macchiato
new file mode 100644
index 0000000..7523f26
--- /dev/null
+++ b/i3/catpuccin-macchiato
@@ -0,0 +1,26 @@
+set $rosewater #f4dbd6
+set $flamingo #f0c6c6
+set $pink #f5bde6
+set $mauve #c6a0f6
+set $red #ed8796
+set $maroon #ee99a0
+set $peach #f5a97f
+set $yellow #eed49f
+set $green #a6da95
+set $teal #8bd5ca
+set $sky #91d7e3
+set $sapphire #7dc4e4
+set $blue #8aadf4
+set $lavender #b7bdf8
+set $text #cad3f5
+set $subtext1 #b8c0e0
+set $subtext0 #a5adcb
+set $overlay2 #939ab7
+set $overlay1 #8087a2
+set $overlay0 #6e738d
+set $surface2 #5b6078
+set $surface1 #494d64
+set $surface0 #363a4f
+set $base #24273a
+set $mantle #1e2030
+set $crust #181926
diff --git a/i3/config b/i3/config
index 38a09a1..fd52a44 100755
--- a/i3/config
+++ b/i3/config
@@ -15,7 +15,7 @@ set $mod Mod4
 # is used in the bar {} block below.
 font pango:Hack Nerd Font 11
 exec --no-startup-id picom -b
-exec --no-startup-id feh --bg-fill $HOME/Pictures/Wallpapers/430795.jpg
+exec --no-startup-id feh --bg-fill ~/Pictures/Wallpapers/the-dreamy-colorful-landscape-5k-9y-3436x1439.jpg 
 exec_always --no-startup-id autotiling -w 1 3 5 7 9
 exec --no-startup-id "sh ~/.xprofile"
 
@@ -169,39 +169,48 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-# COLORSCHEME USED : https://www.icolorpalette.com/imagepalette/otter_mammal_fauna-7 
-# bar {
-#         position top
-#         status_command i3status --transparency
-# 
-#         colors {
-#             background #b7d72cA1
-#             statusline #000000A1
-#             separator #281309A1
-# 
-#                                 #border     Background  Text
-#             focused_workspace   #64391dA1   #64391dA1   #FFFFFFA1
-#             active_workspace    #64391dA1   #64391dA1   #FFFFFFA1
-#             inactive_workspace  #dde368A1   #dde368A1   #000000A1
-#             urgent_workspace    #b7d72cA1   #b7d72cA1   #000000A1
-#             binding_mode        #b7d72cA1   #b7d72cA1   #000000A1
-#         }
-# }
-
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
 
+gaps inner 10
+for_window [all] title_window_icon on padding 5 
+title_align center
+# include ~/.dotfiles/i3/catpuccin-macchiato
+# include ~/.dotfiles/i3/catpuccin
 
+set $rosewater #f4dbd6
+set $flamingo #f0c6c6
+set $pink #f5bde6
+set $mauve #c6a0f6
+set $red #ed8796
+set $maroon #ee99a0
+set $peach #f5a97f
+set $yellow #eed49f
+set $green #a6da95
+set $teal #8bd5ca
+set $sky #91d7e3
+set $sapphire #7dc4e4
+set $blue #8aadf4
+set $lavender #b7bdf8
+set $text #cad3f5
+set $subtext1 #b8c0e0
+set $subtext0 #a5adcb
+set $overlay2 #939ab7
+set $overlay1 #8087a2
+set $overlay0 #6e738d
+set $surface2 #5b6078
+set $surface1 #494d64
+set $surface0 #363a4f
+set $base #24273a
+set $mantle #1e2030
+set $crust #181926
 
-
-#class      border      backgr.     text    indicator   child_border
-
-client.focused               #b38a5b #4f3b22 #FFFFFF #8c5831  #7c2c09 
-client.focused_inactive      #b38a5b #b38a5b #CCCCCC #8c5831  #7c2c09 
-client.unfocused             #b38a5b #b38a5b #CCCCCC #8c5831  #7c2c09 
-
-client.background #FFFFFF 
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
 
 # Volume and brightness controls 
 bindsym XF86AudioPlay exec playerctl play-pause
@@ -214,6 +223,9 @@ bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% # rai
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% # lower volume
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle # toggle mute for default device
 
+for_window [window_role="pop-up"] floating enable
 for_window [title="virtual Machine Manager"] floating enable
 for_window [class="plasmashell" window_type="notification"] floating enable, border none, move right 700px, move down 450px
 no_focus [class="plasmashell" window_type="notification"] 
+for_window [title="Bitwarden" window_role="pop-up"] floating enable
+
diff --git a/i3/otter b/i3/otter
new file mode 100644
index 0000000..0208ec9
--- /dev/null
+++ b/i3/otter
@@ -0,0 +1,45 @@
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
+
+# bar
+bar {
+  colors {
+    background         $base
+    statusline         $text
+    focused_statusline $text
+    focused_separator  $base
+    focused_workspace  $base $base $green
+    active_workspace   $base $base $blue
+    inactive_workspace $base $base $surface1
+    urgent_workspace   $base $base $surface1
+    binding_mode       $base $base $surface1
+  }
+}
+
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
+
+# bar
+bar {
+  colors {
+    background         $base
+    statusline         $text
+    focused_statusline $text
+    focused_separator  $base
+    focused_workspace  $base $base $green
+    active_workspace   $base $base $blue
+    inactive_workspace $base $base $surface1
+    urgent_workspace   $base $base $surface1
+    binding_mode       $base $base $surface1
+  }
+}
diff --git a/nvim b/nvim
index 0d55529..430a287 160000
--- a/nvim
+++ b/nvim
@@ -1 +1 @@
-Subproject commit 0d5552904c43bdbd610c73d998a65c1c27ef5d7e
+Subproject commit 430a2879e96dcb601765aa80a0ea1d6976188236
diff --git a/picom/picom.conf b/picom/picom.conf
index b10a1b9..706a2a9 100644
--- a/picom/picom.conf
+++ b/picom/picom.conf
@@ -1,2 +1,2 @@
 opacity-rule = [ "80:class_g = 'Alacritty'",
-                "80:class_g = 'rofi'" ]; 
+                "80:class_g = 'rofi'", "95:class_g = 'Google-chrome'" ]; 
diff --git a/polybar/colors.ini b/polybar/colors.ini
index 3de9273..7612da0 100644
--- a/polybar/colors.ini
+++ b/polybar/colors.ini
@@ -1,9 +1,8 @@
 [colors]
-background = #64391d
-background-alt = #b38a5b
-foreground = #FFFFFF
-primary = #b7d72c
-secondary = #dde368
-alert = #7c2c09
-disabled = #4f3b22
-
+background = #282a36
+background-alt = #44475a
+foreground = #f8f8f2
+primary = #bd93f9
+secondary = #ffb86c
+alert = #ff5555
+disabled = #6272a4
diff --git a/polybar/colors_custom_otter.ini b/polybar/colors_custom_otter.ini
new file mode 100644
index 0000000..3de9273
--- /dev/null
+++ b/polybar/colors_custom_otter.ini
@@ -0,0 +1,9 @@
+[colors]
+background = #64391d
+background-alt = #b38a5b
+foreground = #FFFFFF
+primary = #b7d72c
+secondary = #dde368
+alert = #7c2c09
+disabled = #4f3b22
+
diff --git a/polybar/modules.ini b/polybar/modules.ini
index 3084d43..c276c5c 100644
--- a/polybar/modules.ini
+++ b/polybar/modules.ini
@@ -91,8 +91,14 @@ label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
 type = internal/date
 interval = 1
 
-date = %d-%m-%Y %H:%M
-date-alt = %Y-%m-%d %H:%M:%S
+date = %d-%m-%Y 
+date-alt = %Y-%m-%d 
 
 label = %date%
 label-foreground = ${colors.primary}
+[module/time]
+type= internal/date
+interval=1
+date = %H:%M:%S
+label = %date%
+
diff --git a/polybar/mybar.ini b/polybar/mybar.ini
index 9042363..efa4a3f 100644
--- a/polybar/mybar.ini
+++ b/polybar/mybar.ini
@@ -3,15 +3,17 @@ width = 100%
 height = 24pt
 radius = 3
 
+offset-x = 50
+offset-y = 50
+
 ; dpi = 96
 
 background = ${colors.background}
 foreground = ${colors.foreground}
-
 line-size = 4pt
 
-border-size = 4pt
-border-color = #64391d
+#border-size = 4pt
+#border-color = ${colors.background}
 
 padding-left = 0
 padding-right = 1
@@ -21,9 +23,11 @@ module-margin = 1
 separator = |
 separator-foreground = ${colors.disabled}
 
-font-0 = monospace;2
+font-0 = "HeavyDataNerdFont:pixelsize=20;2" 
+font-1 = monospace;2
 
-modules-left = xworkspaces xwindow
+modules-center = time 
+modules-left = xworkspaces tray xwindow
 modules-right = pulseaudio memory cpu eth date
 
 cursor-click = pointer
diff --git a/rofi/config b/rofi/config
index 36e3c7c..3a2967e 100644
--- a/rofi/config
+++ b/rofi/config
@@ -3,4 +3,4 @@ rofi.color-enabled: true
 
 rofi.lines: 15
 
-rofi.theme: /usr/share/rofi/themes/Monokai.rasi
+rofi.theme: /usr/share/rofi/themes/rounded-purple-dark.rasi
diff --git a/rofi/config.rasi b/rofi/config.rasi
index a14fb1e..cde2b85 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -145,4 +145,4 @@ configuration {
       sorting-method:    "name";
   }
 }
-@theme "arthur"
+@theme "/home/nigel/.local/share/rofi/themes/rounded-purple-dark.rasi"
diff --git a/tmux/dot-tmux.conf b/tmux/dot-tmux.conf
index cd49307..27a234e 100644
--- a/tmux/dot-tmux.conf
+++ b/tmux/dot-tmux.conf
@@ -13,6 +13,16 @@ bind-key -n 'M-h' select-pane -L
 bind-key -n 'M-j' select-pane -D
 bind-key -n 'M-k' select-pane -U
 bind-key -n 'M-l' select-pane -R
+
+# Map pane resize
+bind-key -r -T prefix 'M-h' resize-pane -L 5
+bind-key -r -T prefix 'M-j' resize-pane -D 5
+bind-key -r -T prefix 'M-k' resize-pane -U 5
+bind-key -r -T prefix 'M-l' resize-pane -R 5
+
+
+
+
 bind h split-window -h
 bind v split-window -v
 
@@ -23,10 +33,11 @@ set-option -g allow-rename off
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'catppuccin/tmux'
 set -g @catppuccin_flavour 'macchiato'
-set -g @catppuccin_status_modules_right "application session"
-set -g @catppuccin_status_modules_left ""
+set -g @catppuccin_status_modules_right "host uptime application session"
 set -s default-terminal 'xterm-256color'
 
+setw -g mode-keys vi
+
 # set some sanity options
 # - This makes sure to keep the window/pane count starting at 1
 setw -g base-index 1