diff --git a/.blackbox/blackbox-files.txt b/.blackbox/blackbox-files.txt
index afbc9d1..0ba6c67 100644
--- a/.blackbox/blackbox-files.txt
+++ b/.blackbox/blackbox-files.txt
@@ -1,6 +1,2 @@
 git/.gituser
 ssh/.ssh/config
-ssh/.ssh/config.d/holidayapi
-ssh/.ssh/config.d/mailshake
-ssh/.ssh/config.d/risksmith
-ssh/.ssh/config.d/sherman
diff --git a/.gitignore b/.gitignore
index 6368b9c..e20c52a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,5 @@ known_hosts
 /.blackbox/pubring.kbx~
 /.blackbox/secring.gpg
 
-/ssh/.ssh/config
-/ssh/.ssh/config.d/holidayapi
-/ssh/.ssh/config.d/mailshake
-/ssh/.ssh/config.d/risksmith
-/ssh/.ssh/config.d/sherman
 /git/.gituser
+/ssh/.ssh/config
diff --git a/git/.gitconfig b/git/.gitconfig
index cdb2c6c..a9f6c7e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -5,10 +5,10 @@
   helper = cache --timeout=86400
 
 [color]
-  branch = always
-  diff = always
-  interactive = always
-  status = always
+  branch = auto
+  diff = auto
+  interactive = auto
+  status = auto
 
 [core]
   editor = nvim
diff --git a/ssh/.ssh/config.d/holidayapi.gpg b/ssh/.ssh/config.d/holidayapi.gpg
deleted file mode 100644
index da3b7ed..0000000
Binary files a/ssh/.ssh/config.d/holidayapi.gpg and /dev/null differ
diff --git a/ssh/.ssh/config.d/mailshake.gpg b/ssh/.ssh/config.d/mailshake.gpg
deleted file mode 100644
index b6140a4..0000000
Binary files a/ssh/.ssh/config.d/mailshake.gpg and /dev/null differ
diff --git a/ssh/.ssh/config.d/risksmith.gpg b/ssh/.ssh/config.d/risksmith.gpg
deleted file mode 100644
index 2fbe53f..0000000
Binary files a/ssh/.ssh/config.d/risksmith.gpg and /dev/null differ
diff --git a/ssh/.ssh/config.d/sherman.gpg b/ssh/.ssh/config.d/sherman.gpg
deleted file mode 100644
index c17121c..0000000
Binary files a/ssh/.ssh/config.d/sherman.gpg and /dev/null differ
diff --git a/ssh/.ssh/config.gpg b/ssh/.ssh/config.gpg
index c27d0a5..c71ead5 100644
Binary files a/ssh/.ssh/config.gpg and b/ssh/.ssh/config.gpg differ