diff --git a/templates/fish.fish b/templates/fish.fish
index 5220f02..65a72ba 100644
--- a/templates/fish.fish
+++ b/templates/fish.fish
@@ -2,40 +2,40 @@
 # Sourced by ~/.config/fish/configs/theme.fish
 
 # Bobthefish theme colors
-set -g theme_username_color {{ colors.primary.default.hex }}
-set -g theme_hostname_color {{ colors.secondary.default.hex }}
-set -g theme_git_branch_color {{ colors.tertiary.default.hex }}
-set -g theme_git_dirty_color {{ colors.error.default.hex }}
-set -g theme_git_staged_color {{ colors.primary.default.hex }}
-set -g theme_pwd_color {{ colors.primary.default.hex }}
-set -g theme_background_color {{ colors.surface_container_lowest.default.hex }}
-set -g theme_foreground_color {{ colors.on_surface.default.hex }}
+set -g theme_username_color "{{ colors.primary.default.hex }}"
+set -g theme_hostname_color "{{ colors.secondary.default.hex }}"
+set -g theme_git_branch_color "{{ colors.tertiary.default.hex }}"
+set -g theme_git_dirty_color "{{ colors.error.default.hex }}"
+set -g theme_git_staged_color "{{ colors.primary.default.hex }}"
+set -g theme_pwd_color "{{ colors.primary.default.hex }}"
+set -g theme_background_color "{{ colors.surface_container_lowest.default.hex }}"
+set -g theme_foreground_color "{{ colors.on_surface.default.hex }}"
 
 # Fish syntax highlighting colors
-set --global fish_color_autosuggestion {{ colors.on_surface_variant.default.hex }}
-set --global fish_color_cancel {{ colors.error.default.hex }}
-set --global fish_color_command {{ colors.primary.default.hex }}
-set --global fish_color_comment {{ colors.outline.default.hex }}
-set --global fish_color_cwd {{ colors.primary.default.hex }}
-set --global fish_color_cwd_root {{ colors.error.default.hex }}
-set --global fish_color_end {{ colors.secondary.default.hex }}
-set --global fish_color_error {{ colors.error.default.hex }}
-set --global fish_color_escape {{ colors.tertiary.default.hex }}
+set --global fish_color_autosuggestion "{{ colors.on_surface_variant.default.hex }}"
+set --global fish_color_cancel "{{ colors.error.default.hex }}"
+set --global fish_color_command "{{ colors.primary.default.hex }}"
+set --global fish_color_comment "{{ colors.outline.default.hex }}"
+set --global fish_color_cwd "{{ colors.primary.default.hex }}"
+set --global fish_color_cwd_root "{{ colors.error.default.hex }}"
+set --global fish_color_end "{{ colors.secondary.default.hex }}"
+set --global fish_color_error "{{ colors.error.default.hex }}"
+set --global fish_color_escape "{{ colors.tertiary.default.hex }}"
 set --global fish_color_history_current --bold
-set --global fish_color_host {{ colors.secondary.default.hex }}
-set --global fish_color_host_remote {{ colors.tertiary.default.hex }}
-set --global fish_color_normal {{ colors.on_surface.default.hex }}
-set --global fish_color_operator {{ colors.secondary.default.hex }}
-set --global fish_color_param {{ colors.on_surface.default.hex }}
-set --global fish_color_quote {{ colors.tertiary.default.hex }}
-set --global fish_color_redirection {{ colors.primary.default.hex }} --bold
-set --global fish_color_search_match {{ colors.on_tertiary_container.default.hex }} --background={{ colors.tertiary_container.default.hex }}
-set --global fish_color_selection {{ colors.on_primary_container.default.hex }} --bold --background={{ colors.primary_container.default.hex }}
-set --global fish_color_status {{ colors.error.default.hex }}
-set --global fish_color_user {{ colors.primary.default.hex }}
+set --global fish_color_host "{{ colors.secondary.default.hex }}"
+set --global fish_color_host_remote "{{ colors.tertiary.default.hex }}"
+set --global fish_color_normal "{{ colors.on_surface.default.hex }}"
+set --global fish_color_operator "{{ colors.secondary.default.hex }}"
+set --global fish_color_param "{{ colors.on_surface.default.hex }}"
+set --global fish_color_quote "{{ colors.tertiary.default.hex }}"
+set --global fish_color_redirection "{{ colors.primary.default.hex }}" --bold
+set --global fish_color_search_match "{{ colors.on_tertiary_container.default.hex }}" --background="{{ colors.tertiary_container.default.hex }}"
+set --global fish_color_selection "{{ colors.on_primary_container.default.hex }}" --bold --background="{{ colors.primary_container.default.hex }}"
+set --global fish_color_status "{{ colors.error.default.hex }}"
+set --global fish_color_user "{{ colors.primary.default.hex }}"
 set --global fish_color_valid_path --underline
-set --global fish_pager_color_completion {{ colors.on_surface_variant.default.hex }}
-set --global fish_pager_color_description {{ colors.on_surface_variant.default.hex }} -i
-set --global fish_pager_color_prefix {{ colors.primary.default.hex }} --bold --underline
-set --global fish_pager_color_progress {{ colors.on_primary_container.default.hex }} --background={{ colors.primary_container.default.hex }}
-set --global fish_pager_color_selected_background {{ colors.secondary_container.default.hex }}
+set --global fish_pager_color_completion "{{ colors.on_surface_variant.default.hex }}"
+set --global fish_pager_color_description "{{ colors.on_surface_variant.default.hex }}" -i
+set --global fish_pager_color_prefix "{{ colors.primary.default.hex }}" --bold --underline
+set --global fish_pager_color_progress "{{ colors.on_primary_container.default.hex }}" --background="{{ colors.primary_container.default.hex }}"
+set --global fish_pager_color_selected_background "{{ colors.secondary_container.default.hex }}"