diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
deleted file mode 100644
index 9a4a957..0000000
--- a/functions/fish_prompt.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function fish_prompt
-    __fish_theme_prompt
-end
\ No newline at end of file
diff --git a/functions/fish_right_prompt.fish b/functions/fish_right_prompt.fish
deleted file mode 100644
index 5d388e3..0000000
--- a/functions/fish_right_prompt.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function fish_right_prompt
-    if functions -q __fish_theme_right_prompt
-        __fish_theme_right_prompt
-    end
-end
\ No newline at end of file
diff --git a/themes/default/prompt.fish b/themes/default/prompt.fish
index 10be6c0..04f279a 100644
--- a/themes/default/prompt.fish
+++ b/themes/default/prompt.fish
@@ -1,7 +1,7 @@
 # Default theme
 # Shell prompt: Left side
 
-function __fish_theme_prompt
+function fish_prompt
     set -l exit_status $status
     set -l prompt_symbol
     set -l user_color
diff --git a/themes/minimaline/prompt.fish b/themes/minimaline/prompt.fish
index b95b135..73b376c 100644
--- a/themes/minimaline/prompt.fish
+++ b/themes/minimaline/prompt.fish
@@ -2,7 +2,7 @@
 # A minimal Powerline-style prompt
 # Dependency: https://git.candifloss.cc/candifloss/PrettyPrompt
 
-function __fish_theme_prompt
+function fish_prompt
     set -l exit_status $status
 
     # Colours