diff --git a/themes/homelab.toml b/themes/homelab.toml
new file mode 100644
index 0000000..1cebabb
--- /dev/null
+++ b/themes/homelab.toml
@@ -0,0 +1,189 @@
+"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
+console_title_template = " {{ .Folder }} :: {{if .Root}}Admin{{end}}"
+final_space = true
+version = 2
+terminal_background = "p:t-background"
+
+[palette]
+main-bg = "transparent"
+terminal-red = "#f7768e"
+pistachio-green = "#9ece6a"
+terminal-green = "#73daca"
+terminal-yellow = "#e0af68"
+terminal-blue = "#7aa2f7"
+celeste-blue = "#b4f9f8"
+light-sky-blue = "#7dcfff"
+terminal-white = "#c0caf5"
+white-blue = "#a9b1d6"
+blue-bell = "#9aa5ce"
+pastal-grey = "#cfc9c2"
+terminal-magenta = "#bb9af7"
+blue-black = "#565f89"
+terminal-black = "#414868"
+t-background = "p:main-bg"
+
+[[blocks]]
+alignment = "left"
+type = "prompt"
+
+[[blocks.segments]]
+type = "text"
+style = "plain"
+background = "transparent"
+foreground = "p:terminal-blue"
+template = "➜ "
+
+[[blocks.segments]]
+type = "username"
+style = "plain"
+foreground = "#090c0c"
+background = "#dc2b4b"
+template = " {{ .User }}"
+
+[[blocks.segments]]
+type = "hostname"
+style = "plain"
+background = "#d9647a"
+foreground = "#090c0c"
+template = " {{ .Host }} 󰿘 󰣀 "
+
+[[blocks.segments]]
+type = "path"
+style = "plain"
+foreground = "#f4b9e8"
+background = "#9d2163"
+template = "<b>{{ .Path }}</b> <p:light-sky-blue>⚡</>"
+
+    [blocks.segments.properties]
+style = "folder"
+truncation_length = 3
+truncation_symbol = "󰇘/"
+
+[[blocks.segments]]
+type = "git"
+style = "plain"
+foreground = "#f289c1"
+background = "#6d274d"
+template = " {{ .HEAD }}"
+
+    [blocks.segments.properties]
+fetch_status = true
+branch_icon = " "
+
+[[blocks.segments]]
+type = "git_status"
+style = "plain"
+foreground = "#AC53EE"
+background = "#6d274d"
+template = "[[$all_status$ahead_behind]]"
+
+[[blocks.segments]]
+type = "php"
+style = "plain"
+foreground = "#769ff0"
+background = "#212736"
+template = " {{ .Full }}"
+
+[[blocks.segments]]
+type = "custom"
+style = "plain"
+foreground = "#5972e3"
+template = ""
+    [blocks.segments.properties]
+command = "echo "
+files = ["Dockerfile", "dockerfile", "docker-compose.yml", "docker-compose.yaml", "compose.yml", "compose.yaml"]
+
+[[blocks.segments]]
+type = "custom"
+style = "plain"
+foreground = "#AC53EE"
+background = "#6d274d"
+template = ""
+    [blocks.segments.properties]
+command = "echo "
+files = [".gitignore", ".gitmodules", ".git/"]
+
+[[blocks.segments]]
+type = "cmd_duration"
+style = "plain"
+foreground = "#AC53EE"
+background = "#3a1424"
+template = "took 󱦟 {{ .Duration }}"
+
+    [blocks.segments.properties]
+min_time = 50
+
+[[blocks.segments]]
+type = "time"
+style = "plain"
+foreground = "#ed4f91"
+background = "#3a1424"
+template = "since  {{ .Time }}"
+
+    [blocks.segments.properties]
+time_format = "%R" # Hour:Minute Format
+
+[[blocks.segments]]
+type = "character"
+style = "plain"
+foreground = "#53e67a"
+template = "󰒍"
+
+    [blocks.segments.properties]
+success_symbol = "󰒍 󰨃"
+error_symbol = "󰒎 󱈸󰨂"
+vimcmd_symbol = ""
+
+[[blocks]]
+alignment = "right"
+overflow = "hide"
+type = "prompt"
+
+[[blocks.segments]]
+type = "node"
+style = "plain"
+foreground = "p:pistachio-green"
+template = " {{ .Full }} "
+
+[[blocks.segments]]
+type = "rust"
+style = "plain"
+foreground = "p:769ff0"
+template = " {{ .Full }} "
+
+[[blocks.segments]]
+type = "go"
+style = "plain"
+foreground = "p:light-sky-blue"
+template = " {{ .Full }}"
+
+[[blocks.segments]]
+type = "command"
+style = "plain"
+foreground = "p:white-blue"
+
+    [blocks.segments.properties]
+command = "git log --pretty=format:%cr -1 || date +%H:%M:%S"
+shell = "bash"
+
+[[blocks]]
+alignment = "left"
+newline = true
+type = "prompt"
+
+[[blocks.segments]]
+foreground = "p:pistachio-green"
+style = "plain"
+template = ""
+type = "text"
+
+[secondary_prompt]
+background = "transparent"
+foreground = "p:terminal-blue"
+template = " "
+
+[transient_prompt]
+type = "status"
+background = "transparent"
+foreground = "p:terminal-blue"
+template = ""
diff --git a/themes/tokyo_storm.toml b/themes/tokyo_storm.toml
index 59416c3..f7ec40e 100644
--- a/themes/tokyo_storm.toml
+++ b/themes/tokyo_storm.toml
@@ -30,7 +30,7 @@ type = "prompt"
 type = "text"
 style = "plain"
 background = "transparent"
-foreground = "p:terminal-blue"
+foreground = "p:terminal-magenta"
 template = "➜ "
 
 [[blocks.segments]]
@@ -120,8 +120,11 @@ newline = true
 type = "prompt"
 
 [[blocks.segments]]
-foreground = "p:pistachio-green"
 style = "plain"
+foreground_templates = [
+    "{{if gt .Code 0}}red{{end}}",
+    "{{if eq .Code 0}}green{{end}}",
+]
 template = ""
 type = "text"
 
@@ -133,5 +136,9 @@ template = " "
 [transient_prompt]
 type = "status"
 background = "transparent"
-foreground = "p:terminal-blue"
+foreground_templates = [
+    "{{if gt .Code 0}}red{{end}}",
+    "{{if eq .Code 0}}green{{end}}",
+]
+# foreground = "p:terminal-blue"
 template = ""