diff --git a/dot.bashrc b/dot.bashrc
index c402b1fae2f3e8ed3e504358c7083d92c18e3378..9ae5d0b357db70c4b204d54a0d697a9c0b3aab13 100644
--- a/dot.bashrc
+++ b/dot.bashrc
@@ -41,4 +41,4 @@ if [ "$PS1" ]; then
 		b_prompt='$ '
 	fi
 fi
-PS1="\n${c_reset}${c_user}\u${c_reset}@${c_host}\h${c_reset}:${c_path}\w${c_reset}\n${b_prompt}"
+PS1="\n${c_reset}${c_user}\u${c_reset}@${c_host}\H${c_reset}:${c_path}\w${c_reset}\n${b_prompt}"
diff --git a/dot.config/fish/config.fish b/dot.config/fish/config.fish
index d2acc95cb9d0ee9c059215171ff7154086cea2f7..0c68159153c8cd75c6d22668a3f0e35c98e79f24 100644
--- a/dot.config/fish/config.fish
+++ b/dot.config/fish/config.fish
@@ -1,17 +1,9 @@
-function fish_prompt
-	echo
-	set_color normal
-	set_color --bold
-	echo -ns "$USER"
-	set_color normal
-	echo -ns '@' (hostname -f) ':'
-	set_color --bold --background blue white
-	echo -ns (pwd)
-	set_color normal
-	echo
-	echo -ns "> "
+function fish_prompt -d "Write out the prompt"
+	printf '\n%s%s%s%s@%s:%s%s%s\n> ' (set_color normal) (set_color --bold) (whoami) (set_color normal) (hostname) (set_color --bold --background blue white) (prompt_pwd) (set_color normal)
 end
 
+export LC_ALL=C
+
 set fish_color_param normal
 set fish_color_error normal
 set fish_color_command normal\x1e\x2d\x2dbold
diff --git a/dot.tcshrc b/dot.tcshrc
index 29f2a80e97298f9c21a79e9d06f67540628958c2..cadda7cab8b9c7d722aeb496a9abc9039cf371eb 100644
--- a/dot.tcshrc
+++ b/dot.tcshrc
@@ -49,5 +49,5 @@ if ($?prompt) then
 		set c_path="37;44"
 		set b_prompt='%% '
 	endif
-	set prompt="\n%B%n%b@%m:%B%{\033[${c_path}m%}%~%b\n${b_prompt}"
+	set prompt="\n%B%n%b@%M:%B%{\033[${c_path}m%}%~%b\n${b_prompt}"
 endif