diff --git a/lib/pages/games.rb b/lib/pages/games.rb
index 1c34908..2fcbf50 100644
--- a/lib/pages/games.rb
+++ b/lib/pages/games.rb
@@ -10,7 +10,7 @@ class W3DHub
 
         body.clear do
           # Games List
-          @games_list_container = stack(width: 0.15, max_width: 148, height: 1.0, scroll: true, border_thickness_right: 1, border_color_right: 0xff_656565) do
+          @games_list_container = stack(width: 0.15, max_width: 148, height: 1.0, scroll: true, border_thickness_right: 1, border_color_right: W3DHub::BORDER_COLOR) do
           end
 
           # Game Menu
diff --git a/lib/pages/games_redesign.rb b/lib/pages/games_redesign.rb
index d0c53db..02f89d2 100644
--- a/lib/pages/games_redesign.rb
+++ b/lib/pages/games_redesign.rb
@@ -14,7 +14,7 @@ class W3DHub
         body.clear do
           stack(width: 1.0, height: 1.0) do
             # Games List
-            @games_list_container = flow(width: 1.0, height: 64, scroll: true, border_thickness_bottom: 1, border_color_bottom: 0xff_656565, padding_left: 32, padding_right: 32) do
+            @games_list_container = flow(width: 1.0, height: 64, scroll: true, border_thickness_bottom: 1, border_color_bottom: W3DHub::BORDER_COLOR, padding_left: 32, padding_right: 32) do
             end
 
             # Game Menu
@@ -83,7 +83,7 @@ class W3DHub
             # background 0xff_9999ff
 
             # Game options
-            stack(width: 360, height: 1.0, padding: 8, scroll: true, border_thickness_right: 1, border_color_right: 0xff_656565) do
+            stack(width: 360, height: 1.0, padding: 8, scroll: true, border_thickness_right: 1, border_color_right: W3DHub::BORDER_COLOR) do
               background 0x44_000000
 
               # Game Banner
diff --git a/lib/states/boot.rb b/lib/states/boot.rb
index 0def1fe..d5f419a 100644
--- a/lib/states/boot.rb
+++ b/lib/states/boot.rb
@@ -25,7 +25,7 @@ class W3DHub
 
         @task_index = 0
 
-        stack(width: 1.0, height: 1.0, border_thickness: 1, border_color: 0xff_aaaaaa) do
+        stack(width: 1.0, height: 1.0, border_thickness: 1, border_color: W3DHub::BORDER_COLOR) do
           stack(width: 1.0, fill: true) do
           end
 
diff --git a/lib/states/interface_redesign.rb b/lib/states/interface_redesign.rb
index a7e5735..1e08cf4 100644
--- a/lib/states/interface_redesign.rb
+++ b/lib/states/interface_redesign.rb
@@ -27,10 +27,10 @@ class W3DHub
 
         theme(W3DHub::THEME)
 
-        @interface_container = stack(width: 1.0, height: 1.0, border_thickness: 1, border_color: 0xff_656565) do
+        @interface_container = stack(width: 1.0, height: 1.0, border_thickness: 1, border_color: W3DHub::BORDER_COLOR) do
           background 0xff_252525
 
-          @header_container = flow(width: 1.0, height: 84, padding: 4, border_thickness_bottom: 1, border_color_bottom: 0xff_656565) do
+          @header_container = flow(width: 1.0, height: 84, padding: 4, border_thickness_bottom: 1, border_color_bottom: W3DHub::BORDER_COLOR) do
             flow(width: 148, height: 1.0) do
               flow(fill: true)
               image "#{GAME_ROOT_PATH}/media/icons/app.png", height: 84
diff --git a/lib/theme.rb b/lib/theme.rb
index 37da598..c940f51 100644
--- a/lib/theme.rb
+++ b/lib/theme.rb
@@ -2,6 +2,8 @@ class W3DHub
   REGULAR_FONT = "#{GAME_ROOT_PATH}/media/fonts/NotoSans-Regular.ttf"
   BOLD_FONT = "#{GAME_ROOT_PATH}/media/fonts/NotoSans-Bold.ttf"
 
+  BORDER_COLOR = W3DHUB_DEVELOPER ? 0xff_ff8844 : 0xff_656565
+
   MAX_PAGE_WIDTH = 1200
 
   TESTING_BUTTON = {
diff --git a/w3d_hub_linux_launcher.rb b/w3d_hub_linux_launcher.rb
index faa896f..392af6a 100644
--- a/w3d_hub_linux_launcher.rb
+++ b/w3d_hub_linux_launcher.rb
@@ -8,6 +8,7 @@ require "logger"
 
 class W3DHub
   W3DHUB_DEBUG = ARGV.join.include?("--debug")
+  W3DHUB_DEVELOPER = ARGV.join.include?("--developer")
 
   GAME_ROOT_PATH = File.expand_path(".", __dir__)
   CACHE_PATH = "#{GAME_ROOT_PATH}/data/cache"