diff --git a/.bashrc b/.bashrc
new file mode 100644
index 0000000..34fa0cd
--- /dev/null
+++ b/.bashrc
@@ -0,0 +1,18 @@
+#
+# ~/.bashrc
+#
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]
+then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=''
+        exec fish $LOGIN_OPTION
+fi
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+PS1='[\u@\h \W]\$ '
+
+alias dotfiles='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME'
+[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index c91bdea..73d4956 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -31,6 +31,7 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:\x1d
 SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_completion:normal
 SETUVAR fish_pager_color_description:yellow\x1e\x2di
diff --git a/.config/fish/functions/ssh.fish b/.config/fish/functions/ssh.fish
new file mode 100644
index 0000000..0b0c849
--- /dev/null
+++ b/.config/fish/functions/ssh.fish
@@ -0,0 +1,4 @@
+function ssh --description 'alias ssh=kitty +kitten ssh'
+  kitty +kitten ssh $argv
+        
+end
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 9d3444f..0e29a4d 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -74,7 +74,6 @@ env = QT_QPA_PLATFORM,xcb
 env = QT_STYLE_OVERRIDE=kvantum
 env = EDITOR, nano
 env = GTK_THEME, Sweet:dark
-env = TERM,xterm
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
 env = XDG_SESSION_DESKTOP,Hyprland
@@ -86,7 +85,7 @@ env = XDG_MENU_PREFIX,arch- kbuildsycoca6
 #env = GBM_BACKEND,nvidia
 #env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 #env = VDPAU_DRIVER, nvidia
-env = SHELL, /bin/fish
+env = SHELL, /bin/bash
 #env = AQ_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1
 
 cursor {
diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf
new file mode 100644
index 0000000..6cd386b
--- /dev/null
+++ b/.config/kitty/current-theme.conf
@@ -0,0 +1,51 @@
+# vim:ft=kitty
+
+## name: Adwaita darker
+## license: MIT
+## author: Emil Löfquist (https://github.com/ewal)
+## upstream: https://github.com/ewal/kitty-adwaita/blob/main/adwaita_darker.conf
+## blurb: Adwaita darker - based on https://github.com/Mofiqul/adwaita.nvim
+
+background                #000000
+foreground                #deddda
+
+selection_background      #1c1c1c
+selection_foreground      #c0bfbc
+
+url_color                 #1a5fb4
+
+wayland_titlebar_color    system
+macos_titlebar_color      system
+
+cursor                    #deddda
+cursor_text_color         #000000
+
+active_border_color       #1e1e1e
+inactive_border_color     #282828
+bell_border_color         #ed333b
+visual_bell_color         none
+
+active_tab_background     #101010
+active_tab_foreground     #fcfcfc
+inactive_tab_background   #1c1c1c
+inactive_tab_foreground   #b0afac
+tab_bar_background        none
+tab_bar_margin_color      none
+
+color0                    #000000
+color1                    #ed333b
+color2                    #57e389
+color3                    #ff7800
+color4                    #62a0ea
+color5                    #9141ac
+color6                    #5bc8af
+color7                    #deddda
+
+color8                    #9a9996
+color9                    #f66151
+color10                   #8ff0a4
+color11                   #ffa348
+color12                   #99c1f1
+color13                   #dc8add
+color14                   #93ddc2
+color15                   #f6f5f4
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 230e5ac..21c5ed2 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1 +1,20 @@
 background_opacity 0.75
+window_padding_width 5
+window_border_width 0
+
+tab_bar_edge top
+active_tab_foreground #fff
+active_tab_font_style bold-italic
+active_tab_background #8631B4
+inactive_tab_foreground #c2c2c2
+inactive_tab_background #955bb4
+
+# BEGIN_KITTY_THEME
+# Adwaita darker
+include current-theme.conf
+# END_KITTY_THEME
+active_tab_foreground #fff
+active_tab_font_style bold-italic
+active_tab_background #8631B4
+inactive_tab_foreground #c2c2c2
+inactive_tab_background #955bb4