diff --git a/config/alacritty.yml b/config/alacritty.yml
index 78c98bc..1ff2230 100644
--- a/config/alacritty.yml
+++ b/config/alacritty.yml
@@ -5,8 +5,8 @@ window:
   title: Alacritty
   dynamic_padding: false
   padding:
-    x: 6
-    y: 6
+    x: 0
+    y: 2
 
   class:
     instance: Alacritty
@@ -51,36 +51,36 @@ font:
 schemes:
   vscode: &vscode
     primary:
-     background: '#1e1e1e'
-     foreground: '#d4d4d4'
+      background: "#1e1e1e"
+      foreground: "#d4d4d4"
     cursor:
       text: CellBackground
-      cursor: '#d4d4d4'
+      cursor: "#d4d4d4"
     normal:
-      black:   '#1e1e1e'
-      red:     '#f44747'
-      green:   '#608b4e'
-      yellow:  '#dcdcaa'
-      blue:    '#569cd6'
-      magenta: '#c678dd'
-      cyan:    '#56b6c2'
-      white:   '#d4d4d4'
+      black: "#1e1e1e"
+      red: "#f44747"
+      green: "#608b4e"
+      yellow: "#dcdcaa"
+      blue: "#569cd6"
+      magenta: "#c678dd"
+      cyan: "#56b6c2"
+      white: "#d4d4d4"
     bright:
-      black:   '#545454'
-      red:     '#f44747'
-      green:   '#608b4e'
-      yellow:  '#dcdcaa'
-      blue:    '#569cd6'
-      magenta: '#c678dd'
-      cyan:    '#56b6c2'
-      white:   '#d4d4d4'
+      black: "#545454"
+      red: "#f44747"
+      green: "#608b4e"
+      yellow: "#dcdcaa"
+      blue: "#569cd6"
+      magenta: "#c678dd"
+      cyan: "#56b6c2"
+      white: "#d4d4d4"
 
 colors: *vscode
 
 key_bindings:
-  - { key: V,         mods: Control|Shift, action: Paste            }
-  - { key: C,         mods: Control|Shift, action: Copy             }
-  - { key: Key0,      mods: Control,       action: ResetFontSize    }
-  - { key: Plus,      mods: Control,       action: IncreaseFontSize }
-  - { key: Minus,     mods: Control,       action: DecreaseFontSize }
-  - { key: F11,       mods: None,          action: ToggleFullscreen }
+  - { key: V, mods: Control|Shift, action: Paste }
+  - { key: C, mods: Control|Shift, action: Copy }
+  - { key: Key0, mods: Control, action: ResetFontSize }
+  - { key: Plus, mods: Control, action: IncreaseFontSize }
+  - { key: Minus, mods: Control, action: DecreaseFontSize }
+  - { key: F11, mods: None, action: ToggleFullscreen }
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 7e0e53d..484f57d 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -1,41 +1,57 @@
-font_family JetBrains Mono
-disable_ligatures always
-enable_audio_bell no
-open_url_modifiers ctrl
+linux_display_server x11
+sync_to_monitor      yes
+
+## Font
+font_size         12.0
+font_family       Jetbrains Mono
+bold_font         auto
+italic_font       auto
+bold_italic_font  auto
+disable_ligatures never
+
+## Bell
+enable_audio_bell    no
+visual_bell_duration 0
+
+## Cursor
+cursor_beam_thickness 0
+cursor_shape underline
+cursor_underline_thickness 1.3
 cursor_blink_interval 0
-tab_bar_edge bottom
-tab_bar_style separator
-tab_separator ""
-tab_title_template "{index}: {title}"
 
-map ctrl+equal change_font_size all +2
-map ctrl+minus change_font_size all -2
-map ctrl+backspace change_font_size all 0
-map ctrl+alt+r load_config_file
-map ctrl+1 goto_tab 1
-map ctrl+2 goto_tab 2
-map ctrl+3 goto_tab 3
-map ctrl+4 goto_tab 4
+## Mouse
+mouse_hide_wait 3.0
+focus_follows_mouse no
 
-color0 #232323
-color1 #ff000f
-color2 #8ce10b
-color3 #ffb900
-color4 #008df8
-color5 #6d43a6
-color6 #00d8eb
-color7 #ffffff
-color8 #444444
-color9 #ff2740
-color10 #abe15b
-color11 #ffd242
-color12 #0092ff
-color13 #9a5feb
-color14 #67fff0
-color15 #ffffff
-# background #0e1019
-background #1e1e1e
-selection_foreground #0e1019
-cursor #ff0018
-foreground #fffaf4
-selection_background #fffaf4
+## Mappings
+map ctrl+shift+1 goto_tab 1
+map ctrl+shift+2 goto_tab 2
+map ctrl+shift+3 goto_tab 3
+map ctrl+shift+4 goto_tab 4 
+map ctrl+shift+5 goto_tab 5 
+
+## Colors
+background #1E1E29
+# background #1e1e1e
+
+
+foreground #d4d4d4
+selection_background #d7ba7d
+selection_foreground #1e1e1e
+url_color #0087BD
+color0 #1e1e1e
+color8 #808080
+color1 #f44747
+color9 #f44747
+color2 #608b4e
+color10 #608b4e
+color3 #dcdcaa
+color11 #dcdcaa
+color4  #569cd6
+color12 #569cd6
+color5 #c678dd
+color13 #c678dd
+color6 #56b6c2
+color14 #56b6c2
+color7 #d4d4d4
+color15 #d4d4d4
diff --git a/vscode/settings.json b/vscode/settings.json
index 8eda974..0ae9515 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "workbench.colorTheme": "Default Dark+",
   "workbench.iconTheme": "material-icon-theme",
-  "workbench.sideBar.location": "left",
+  "workbench.sideBar.location": "right",
   "workbench.startupEditor": "none",
   "workbench.activityBar.visible": false,
   "window.menuBarVisibility": "toggle",
@@ -11,7 +11,8 @@
   "terminal.integrated.fontSize": 15,
   // Editor
   "editor.fontFamily": "'Jetbrains Mono'",
-  "editor.cursorSmoothCaretAnimation": true,
+  "editor.cursorSmoothCaretAnimation": false,
+  "editor.cursorBlinking": "expand",
   "editor.smoothScrolling": true,
   "editor.inlineSuggest.enabled": true,
   "editor.hover.enabled": true,
@@ -28,7 +29,11 @@
   "files.trimTrailingWhitespace": true,
   "files.exclude": {
     "**/node_modules": true,
-    "**/env": true
+    "**/env": true,
+    "**/.classpath": true,
+    "**/.project": true,
+    "**/.settings": true,
+    "**/.factorypath": true
   },
   // Git
   "git.autofetch": true,
@@ -40,7 +45,7 @@
   "tabnine.experimentalAutoImports": true,
   // Languages
   "go.lintOnSave": "package",
-  "go.lintTool": "golangci-lint",
+  // "go.lintTool": "golangci-lint",
   "go.formatTool": "gofumpt",
   "python.formatting.provider": "black",
   "python.analysis.autoImportCompletions": true,
@@ -61,7 +66,10 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.tabSize": 2
   },
-  "files.associations": {
-    "justfile": "makefile"
-  }
-}
+  "vim.hlsearch": true,
+  "vim.useSystemClipboard": true,
+  "workbench.editorAssociations": {
+    "*.mp4": "default"
+  },
+  "liveServer.settings.donotVerifyTags": true
+}
\ No newline at end of file
diff --git a/zshrc b/zshrc
index 8e8d93a..4a733bc 100644
--- a/zshrc
+++ b/zshrc
@@ -4,10 +4,10 @@ export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yar
 export EDITOR="nvim"
 
 ## Oh my zsh
-plugins=(git dotenv npm yarn extract)
+plugins=(git dotenv yarn extract)
 ZSH_THEME="simple"
 DISABLE_AUTO_TITLE="true"
-source "$HOME/.oh-my-zsh/oh-my-zsh.sh"
+source $HOME/.oh-my-zsh/oh-my-zsh.sh
 
 ## Tools
 eval $(fnm env)
@@ -17,8 +17,10 @@ eval "$(zoxide init zsh)"
 alias cls="clear" cp="cp -r" mkdir="mkdir -p"
 alias gor="go run" gob="go build" gog="go get"
 alias ...="cd ../.." .3="cd ../../.."
-alias v="nvim" vim="v" vi="vim" asdfi=". /opt/asdf-vm/asdf.sh"
+alias v="nvim" vim="v" vi="vim"
+alias asdfi=". /opt/asdf-vm/asdf.sh" sdki=". $HOME/.sdkman/bin/sdkman-init.sh"
 
 if [[ -f "/bin/exa" ]]; then
    alias ls="exa -l" ll="ls" la="ls -a"
 fi
+