diff --git a/etc/ssh/ssh_config b/etc/ssh/ssh_config
index 308ca961..dc564996 100644
--- a/etc/ssh/ssh_config
+++ b/etc/ssh/ssh_config
@@ -38,7 +38,7 @@ Host *
 
 	# Send needed environment variables. I don't like setting wildcards
 	# and LC_ALL is disabled on purpouse.
-	SendEnv EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TMUX TZ
+	SendEnv COLORTERM EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TERM TMUX TZ
 
 	# "ssh will automatically add new host keys to the user's known_hosts file, but will not permit connections to hosts with changed host keys."
 	StrictHostKeyChecking accept-new
diff --git a/etc/ssh/sshd_config.d/acceptenv.conf b/etc/ssh/sshd_config.d/acceptenv.conf
index 715c4157..1d4efd86 100644
--- a/etc/ssh/sshd_config.d/acceptenv.conf
+++ b/etc/ssh/sshd_config.d/acceptenv.conf
@@ -1,3 +1,3 @@
 # Allow the client to send needed environment variables. I don't like
 # setting wildcards and LC_ALL is disabled on purpose.
-AcceptEnv EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TMUX TERM TZ
+AcceptEnv COLORTERM EDITOR LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION TMUX TERM TZ
diff --git a/etc/sudoers.d/envkeep-extras b/etc/sudoers.d/envkeep-extras
new file mode 100644
index 00000000..590b5924
--- /dev/null
+++ b/etc/sudoers.d/envkeep-extras
@@ -0,0 +1,2 @@
+# Remember these environment variables
+env_keep += "TERM COLORTERM"