diff --git a/gitconfig b/gitconfig
index 021cb3f..d241142 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,21 +1,21 @@
-# default to personal config
-[include]
-  path = ~/.gitconfig.personal
-
-# when working on work projects
-[includeIf "gitdir:**/work/**/.git"]
-  path = ~/.gitconfig.work
-  
+[user]
+	name = Christoffer Martinsson
+	email = cm@cmtec.se
 [credential]
-        helper = cache
+    helper = store --file ~/.my-credentials
 [credential "https://dev.azure.com"]
-        useHttpPath = true
+    useHttpPath = true
 [credential "https://git.cmtec.se"]
-        helper = store
-        username = cm
+    helper = store --file ~/.my-credentials
+    username = cm
 [pull]
 	rebase = false
 [merge]
 	tool = nvimdiff
 [mergetool]
 	keepBackup = false
+
+# when working on work projects
+[includeIf "gitdir:**/work/**/.git"]
+    path = ~/code_server/gitconfig.work
+  
diff --git a/gitconfig.personal b/gitconfig.personal
deleted file mode 100644
index ef3b31b..0000000
--- a/gitconfig.personal
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-	name = Christoffer Martinsson
-	email = cm@cmtec.se 
diff --git a/gitconfig.work b/gitconfig.work
index ddcd521..c91f9a7 100644
--- a/gitconfig.work
+++ b/gitconfig.work
@@ -3,5 +3,5 @@
 	email = christoffer.martinsson@mildef.com
 
 [credential "https://git.mildef.com"]
-        helper = store
+        helper = store --file ~/.my-credentials
         username = christoffer
diff --git a/tmux.conf b/tmux.conf
index 735e5fd..40fa903 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -45,7 +45,7 @@ set-option -sg escape-time 1
 set-option -g focus-events on
 
 # set -g allow-passthrough on
-set -g extended-keys on
+# set -g extended-keys on
 set -g status-interval 2
 set -g status-bg "#0c0c0c" 
 set -g status-fg "#6c6c6c"