diff --git a/Xresources b/Xresources
index 80a1fb3..5b7723d 100644
--- a/Xresources
+++ b/Xresources
@@ -1,61 +1,38 @@
 !! Colorscheme
 
-! special
-*.foreground: #f1f1f1
-*.background: #282a33
-*.cursorColor: #f1f1f1
+
+*background: #0E1019
+*foreground: #CDD6F4
 
 ! black
-*.color0: #000
-*.color8: #000
+*color0: #45475A
+*color8: #585B70
 
 ! red
-*.color1: #cc817f
-*.color9: #cc817f
+*color1: #F38BA8
+*color9: #F38BA8
 
 ! green
-*.color2: #7ccfaf
-*.color10: #7ccfaf
+*color2: #A6E3A1
+*color10: #A6E3A1
 
 ! yellow
-*.color3: #ffcc99
-*.color11: #ffcc99
+*color3: #F9E2AF
+*color11: #F9E2AF
 
 ! blue
-*.color4: #8ac6f2
-*.color12: #8ac6f2
+*color4: #89B4FA
+*color12: #89B4FA
 
 ! magenta
-*.color5: #9999cc
-*.color13: #9999cc
+*color5: #F5C2E7
+*color13: #F5C2E7
 
 ! cyan
-*.color6: #8abeb7
-*.color14: #8abeb7
+*color6: #94E2D5
+*color14: #94E2D5
 
 ! white
-*.color7: #f1f1f1
-*.color15: #f1f1f1
+*color7: #BAC2DE
+*color15: #A6ADC8
 
-!! URxvt Appearance
-Xft.dpi: 96
-Xft.rbga: rgb
-Xft.antialias: true
-Xft.hinting: true
-Xft.hintstyle: hintslight
-URxvt*font: xft:Hack Nerd Font Mono:style=Regular:size=12
-URxvt*letterSpace: 0
-URxvt.lineSpace: 0
-URxvt.geometry: 400x400
-URxvt.internalBorder: 2
-URxvt.cursorBlink: true
-URxvt.cursorUnderline: false
-URxvt.saveline: 2048
-URxvt.scrollBar: true
-URxvt.scrollBar_right: true
-URxvt.scrollstyle: plain
-URxvt.urgentOnBell: true
-URxvt.depth: 24
-URxvt.iso14755: false
-URxvt.perl-lib: .config/urxvt/ext
-URxvt.perl-ext-common: ibeamcursor
diff --git a/i3/config b/i3/config
index eda004b..2c3a3c2 100644
--- a/i3/config
+++ b/i3/config
@@ -6,38 +6,39 @@
 
 # Variables
 
-set_from_resource $color_bg         i3wm.background #111111
-set_from_resource $color_fg         i3wm.foreground #f1f1f1
+set_from_resource $color_bg         i3wm.background #0E1019
+set_from_resource $color_fg         i3wm.foreground #eceef4
 
-set_from_resource $color_red        i3wm.color1 #cc817f
-set_from_resource $color_green      i3wm.color2 #7ccfaf
-set_from_resource $color_yellow     i3wm.color3 #ffcc99
-set_from_resource $color_blue       i3wm.color4 #8ac6f2
-set_from_resource $color_magenta    i3wm.color5 #9999cc
+set_from_resource $color_red        i3wm.color1 #F38BA8
+set_from_resource $color_green      i3wm.color2 #A6E3A1
+set_from_resource $color_yellow     i3wm.color3 #F9E2AF
+set_from_resource $color_blue       i3wm.color4 #89B4FA
+set_from_resource $color_magenta    i3wm.color5 #F5C2E7
 
 set_from_resource $color_gray0   i3wm.colorGray0  #383a43
 set_from_resource $color_gray1   i3wm.colorGray1  #404754
 
 set_from_resource $color_win_focus_fg   i3wm.foreground #f1f1f1
-set_from_resource $color_win_focus_bg   i3wm.colorGray1  #404754
+set_from_resource $color_win_focus_bg   i3wm.colorGray1 #131521
 set_from_resource $color_win_unfocus_fg i3wm.foreground #f1f1f1
-set_from_resource $color_win_unfocus_bg i3wm.colorGray0  #383a43
+set_from_resource $color_win_unfocus_bg i3wm.colorGray0  #0E1019
 set_from_resource $color_win_urgent_fg i3wm.foreground #f1f1f1
 set_from_resource $color_win_urgent_bg i3wm.color1 #cc817f
 
+set_from_resource $color_border i3wm.colorOverlay0 #131521
+
 set $mod    Mod4
 set $super  Shift
 
-set $ws1 "1:main "
-set $ws2 "2:www "
-set $ws3 "3:code "
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
 set $ws4 "4"
 set $ws5 "5"
-set $ws6 "6:chat"
+set $ws6 "6"
 set $ws7 "7"
 set $ws8 "8"
 set $ws9 "9"
-set $ws10 "10"
 
 #set $second_monitor eDP-1
 
@@ -50,19 +51,14 @@ exec --no-startup-id dex-autostart --autostart --environment i3
 
 ## Config
 
-font pango:FontAwesome, DejaVu Sans Mono 11
+font pango:JetBrainsMono NF Bold 11
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-# move tiling windows via drag & drop by left-clicking into the title bar,
-# or left-clicking anywhere into the window while holding the floating modifier.
-tiling_drag modifier titlebar
-
 # start a terminal
 #bindsym $mod+Return exec urxvt -e fish
 bindsym $mod+Return exec kitty
-
 # kill focused window
 bindsym $mod+x kill
 
@@ -73,10 +69,10 @@ bindsym $mod+d exec "rofi -show drun"
 bindsym $mod+$super+f exec "xautolock -locknow"
 
 # change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+odiaeresis focus right
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -85,10 +81,10 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+$super+j move left
-bindsym $mod+$super+k move down
-bindsym $mod+$super+l move up
-bindsym $mod+$super+odiaeresis move right
+bindsym $mod+$super+h move left
+bindsym $mod+$super+j move down
+bindsym $mod+$super+k move up
+bindsym $mod+$super+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+$super+Left move left
@@ -97,7 +93,7 @@ bindsym $mod+$super+Up move up
 bindsym $mod+$super+Right move right
 
 # split in horizontal orientation
-bindsym $mod+h split h
+bindsym $mod+$super+v split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -132,6 +128,10 @@ workspace $ws5 output primary
 #for second screen
 #workspace $ws6 output $second_monitor gaps inner 0
 workspace $ws6 output primary
+workspace $ws7 output primary
+workspace $ws8 output primary
+workspace $ws9 output primary
+
 
 # switch to workspace
 bindsym $mod+1 workspace number $ws1
@@ -143,7 +143,6 @@ bindsym $mod+6 workspace number $ws6
 bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
 
 # move focused container to workspace
 bindsym $mod+$super+1 move container to workspace number $ws1
@@ -155,7 +154,6 @@ bindsym $mod+$super+6 move container to workspace number $ws6
 bindsym $mod+$super+7 move container to workspace number $ws7
 bindsym $mod+$super+8 move container to workspace number $ws8
 bindsym $mod+$super+9 move container to workspace number $ws9
-bindsym $mod+$super+0 move container to workspace number $ws10
 
 # reload the configuration file
 bindsym $mod+c reload
@@ -171,6 +169,14 @@ assign [class="^Vivaldi"] $ws2
 assign [class="^Code$"] $ws3
 assign [class="^Telegram"] $ws6
 
+
+for_window [window_role="pop-up"]                       floating enable
+for_window [window_role="bubble"]                       floating enable 
+for_window [window_role="task_dialog"]                  floating enable
+for_window [window_role="Preferences"]                  floating enable
+for_window [window_type="dialog"]                       floating enable 
+for_window [window_type="menu"]                         floating enable
+
 # resize window (you can also use the mouse for that)
 mode "resize" {
     # These bindings trigger as soon as you enter the resize mode
@@ -179,15 +185,15 @@ mode "resize" {
     # Pressing right will grow the window’s width.
     # Pressing up will shrink the window’s height.
     # Pressing down will grow the window’s height.
-    bindsym j resize shrink width 10 px
-    bindsym k resize grow height 10 px
-    bindsym l resize shrink height 10 px
-    bindsym odiaeresis resize grow width 10 px
+    bindsym h resize shrink width 10 px
+    bindsym j resize grow height 10 px
+    bindsym k resize shrink height 10 px
+    bindsym l resize grow width 10 px
 
-    bindsym Shift+j resize shrink width 25 px
-    bindsym Shift+k resize grow height 25 px
-    bindsym Shift+l resize shrink height 25 px
-    bindsym Shift+odiaeresis resize grow width 25 px
+    bindsym $super+h resize shrink width 25 px
+    bindsym $super+j resize grow height 25 px
+    bindsym $super+k resize shrink height 25 px
+    bindsym $super+l resize grow width 25 px
 
     # same bindings, but for the arrow keys
     bindsym Left resize shrink width 10 px
@@ -203,18 +209,17 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-default_border normal 1
-hide_edge_borders vertical
+default_border pixel 1
 
 # COLORS
 
 client.background       $color_bg
 
 # class                 border                  bground                  text                   indicator                child_border
-client.focused          $color_win_focus_bg     $color_win_focus_bg      $color_win_focus_fg    $color_win_focus_bg      $color_win_focus_bg
-client.focused_inactive $color_win_unfocus_bg   $color_win_unfocus_bg    $color_win_unfocus_fg  $color_win_unfocus_bg    $color_win_unfocus_bg
-client.unfocused        $color_win_unfocus_bg   $color_win_unfocus_bg    $color_win_unfocus_fg  $color_win_unfocus_bg    $color_win_unfocus_bg
-client.urgent           $color_win_urgent_bg    $color_win_urgent_bg     $color_win_urgent_fg   $color_win_urgent_bg     $color_win_urgent_bg
+client.focused          $color_win_focus_bg     $color_win_focus_bg      $color_win_focus_fg    $color_win_focus_bg      $color_border
+client.focused_inactive $color_win_unfocus_bg   $color_win_unfocus_bg    $color_win_unfocus_fg  $color_win_unfocus_bg    $color_border
+client.unfocused        $color_win_unfocus_bg   $color_win_unfocus_bg    $color_win_unfocus_fg  $color_win_unfocus_bg    $color_border
+client.urgent           $color_win_urgent_bg    $color_win_urgent_bg     $color_win_urgent_fg   $color_win_urgent_bg     $color_border
 client.placeholder      $color_bg               $color_bg                $color_fg              $color_bg                $color_bg
 
 # Start i3bar to display a workspace bar (plus the system information i3status
@@ -222,21 +227,22 @@ client.placeholder      $color_bg               $color_bg                $color_
 bar {
     output primary
     status_command i3status
-    separator_symbol " | ​"
-    padding 4 0
+    separator_symbol " | "
+    padding 0 0
     tray_padding 4
 
-    font pango:DejaVu Sans Mono, FontAwesome 14
+    # font pango:DejaVu Sans Mono, FontAwesome 12
+    font pango:JetBrainsMono NF SemiBold 14
     strip_workspace_numbers no
     strip_workspace_name no
-    workspace_min_width 50
+    workspace_min_width 32
 
     colors {
         background $color_bg
         statusline $color_white
-        separator  $color_gray
+        separator  $color_white
 
-        focused_workspace  $color_gray1     $color_gray1    $color_fg
+        focused_workspace  $color_blue      $color_blue     $color_bg
         active_workspace   $color_yellow    $color_yellow   $color_bg
         inactive_workspace $color_bg        $color_bg       $color_fg
         urgent_workspace   $color_red       $color_red      $color_bg
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 0554221..faaa978 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,50 +1,89 @@
+
+term xterm-kitty
+
 font_family		  JetBrainsMono NF Bold
-bold_font         auto
-italic_font       auto
-bold_italic_font  auto
+bold_font         JetBrainsMono NF ExtraBold
+italic_font       JetBrainsMono NF Italic
+bold_italic_font  JetBrainsMono NF Bold Italic
 font_size         12.0
 disable_ligatures never
 
+clipboard_control write-primary write-clipboard no-append
+
+# Rendering
+sync_to_monitor no
+
 # Cursor
 cursor_shape beam
-
-term xterm-256color
+#term xterm-256color
 
 # Colors
+foreground              #eceef4
+background              #0E1019
+selection_foreground    #0E1019
+selection_background    #F5E0DC
 
-foreground #f1f1f1
-background #282a33
-selection_foreground none
-selection_background none
+# Cursor colors
+cursor                  #F5E0DC
+cursor_text_color       #1E1E2E
+
+# URL underline color when hovering with mouse
+url_color               #F5E0DC
+
+# Kitty window border colors
+active_border_color     #B4BEFE
+inactive_border_color   #6C7086
+bell_border_color       #F9E2AF
+
+# OS Window titlebar colors
+wayland_titlebar_color  #1E1E2E
+macos_titlebar_color    #1E1E2E
+
+# Tab bar colors
+active_tab_foreground   #11111B
+active_tab_background   #CBA6F7
+inactive_tab_foreground #CDD6F4
+inactive_tab_background #181825
+tab_bar_background      #11111B
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1E1E2E
+mark1_background #B4BEFE
+mark2_foreground #1E1E2E
+mark2_background #CBA6F7
+mark3_foreground #1E1E2E
+mark3_background #74C7EC
+
+# The 16 terminal colors
 
 # black
-color0 #000
-color8 #000
+color0 #45475A
+color8 #585B70
 
 # red
-color1 #cc817f
-color9 #cc817f
+color1 #F38BA8
+color9 #F38BA8
 
 # green
-color2 #7ccfaf
-color10 #7ccfaf
+color2  #A6E3A1
+color10 #A6E3A1
 
 # yellow
-color3 #ffcc99
-color11 #ffcc99
+color3  #F9E2AF
+color11 #F9E2AF
 
 # blue
-color4 #8ac6f2
-color12 #8ac6f2
+color4  #89B4FA
+color12 #89B4FA
 
 # magenta
-color5 #9999cc
-color13 #9999cc
+color5  #F5C2E7
+color13 #F5C2E7
 
 # cyan
-color6 #8abeb7
-color14 #8abeb7
+color6  #94E2D5
+color14 #94E2D5
 
 # white
-color7 #f1f1f1
-color15 #f1f1f1
+color7  #BAC2DE
+color15 #A6ADC8
diff --git a/rofi/theme.rasi b/rofi/theme.rasi
index 96e3c8d..1bd1dc7 100644
--- a/rofi/theme.rasi
+++ b/rofi/theme.rasi
@@ -1,10 +1,10 @@
 * {
-    font:   "IBM Plex Mono 12";
+    font:   "JetBrainsMono NF Medium 12";
 
-    bg:        #282a33;
-    gray:      #404754;
-    blue:      #8ac6f2;
-    white:     #eceff4;
+    bg:        #0E1019;
+    gray:      #131521;
+    blue:      #89b4fa;
+    white:     #eceef4;
     yellow:    #ebcb8b;
 
     background-color:   transparent;
@@ -81,4 +81,4 @@ element-icon {
 
 element-text {
     text-color: inherit;
-}
\ No newline at end of file
+}
diff --git a/tmux.conf b/tmux.conf
index f9b29cf..0747240 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,16 +1,30 @@
-set -g default-terminal "xterm-256color"
-set-option -ga terminal-overrides ",xterm-256color:Tc"
+set -g default-terminal "xterm-kitty"
+#set-option -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-kitty:Tc:clipboard:usstyle"
+
+set-window-option -g mode-keys vi
+set -g escape-time 10
+set -g focus-events on
+set -g mouse off
+
+set -g base-index 1
+setw -g pane-base-index 1
+
+# remap prefix
+unbind C-b
+set -g prefix C-a
+bind C-a send-prefix
 
 set -g status-position bottom
 set -g status-justify left
-set -g status-style 'fg=color10'
-set -g status-left ''
+set -g status-style ''
+set -g status-left '#[bg=colour3,fg=#0E1019] #(hostname) #[fg=color3,bg=default]'
 set -g status-right ''
 set -g status-right-length 50
-set -g status-left-length 10
+set -g status-left-length 50
 
 setw -g window-status-style ''
-setw -g window-status-format '#[fg=colour4]#I#[fg=colour7] #W'
-setw -g window-status-current-style 'fg=colour0 bg=colour4 bold'
-setw -g window-status-current-format ' #I #W #F '
-setw -g window-status-separator '#[fg=colour4] | #[fg=colour7]'
+setw -g window-status-format '  #[fg=colour4]#I#[fg=colour15] #W  '
+setw -g window-status-current-style 'fg=#0E1019 bg=color4 bold'
+setw -g window-status-current-format ' #I #W '
+setw -g window-status-separator ''