diff --git a/themes/uggedal/fish_prompt.fish b/themes/uggedal/fish_prompt.fish
new file mode 100644
index 0000000..ec4bf59
--- /dev/null
+++ b/themes/uggedal/fish_prompt.fish
@@ -0,0 +1,7 @@
+function fish_prompt
+  if test -n "$SSH_CONNECTION"
+    printf '%s ' $HOSTNAME
+  end
+
+  printf '%s ' (prompt_pwd)
+end
diff --git a/themes/uggedal/fish_right_prompt.fish b/themes/uggedal/fish_right_prompt.fish
new file mode 100644
index 0000000..b86c43c
--- /dev/null
+++ b/themes/uggedal/fish_right_prompt.fish
@@ -0,0 +1,9 @@
+function fish_right_prompt
+  set -l last_status $status
+
+  if test $last_status -ne 0
+    set_color red
+    printf '%d' $last_status
+    set_color normal
+  end
+end