moved main UI palettes to themes.lua and set configurators to use it

coordinator/configure.lua

@@ -55,21 +55,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
@@ -841,30 +827,26 @@ local function config_view(display)
     TextBox{parent=clr_c_2,x=1,y=1,height=6,text="By default, this project uses green/red heavily to distinguish ok and not, with some indicators also using multiple colors. By selecting a color blindness below, blues will be used instead of greens on indicators and multi-color indicators will be split up as space permits."}
 
     local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
         if value == 1 then
             for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
-        elseif value == themes.COLOR_MODE.DEUTERANOPIA then
+        else
-            term.setPaletteColor(colors.green, 0x1081ff)
+            term.setPaletteColor(colors.green, c[1].hex)
-            term.setPaletteColor(colors.yellow, 0xf7c311)
+            term.setPaletteColor(colors.yellow, c[2].hex)
-            term.setPaletteColor(colors.red, 0xfb5615)
+            term.setPaletteColor(colors.red, c[3].hex)
-        elseif value == themes.COLOR_MODE.PROTANOPIA then
-            term.setPaletteColor(colors.green, 0x1081ff)
-            term.setPaletteColor(colors.yellow, 0xf5e633)
-            term.setPaletteColor(colors.red, 0xff521a)
-        elseif value == themes.COLOR_MODE.TRITANOPIA then
-            term.setPaletteColor(colors.green, 0x00ecff)
-            term.setPaletteColor(colors.yellow, 0xffbc00)
-            term.setPaletteColor(colors.red, 0xff0000)
         end
     end
 
-    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+    TextBox{parent=clr_c_2,x=1,y=8,height=1,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=9,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
 
-    local _ = IndLight{parent=clr_c_2,x=20,y=8,label="Good",colors=cpair(colors.black,colors.green),value=true}
+    TextBox{parent=clr_c_2,x=20,y=8,height=1,text="Preview"}
-    _ = IndLight{parent=clr_c_2,x=20,y=9,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    local _ = IndLight{parent=clr_c_2,x=20,y=9,label="Good",colors=cpair(colors.black,colors.green),value=true}
-    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Bad",colors=cpair(colors.black,colors.red),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=11,label="Bad",colors=cpair(colors.black,colors.red),value=true}
 
-    TextBox{parent=clr_c_2,x=20,y=12,height=6,text="Exact color varies by theme.",fg_bg=g_lg_fg_bg}
+    TextBox{parent=clr_c_2,x=1,y=14,height=6,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
 
     PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 

coordinator/ui/style.lua

@@ -45,48 +45,10 @@ local smooth_stone = {
     highlight_box_bright = cpair(colors.black, colors.white),
     field_box = cpair(colors.black, colors.white),
 
-    colors = {
+    colors = themes.smooth_stone.colors,
-        { c = colors.red,       hex = 0xdf4949 },
-        { c = colors.orange,    hex = 0xffb659 },
-        { c = colors.yellow,    hex = 0xfffc79 },
-        { c = colors.lime,      hex = 0x80ff80 },
-        { c = colors.green,     hex = 0x4aee8a },
-        { c = colors.cyan,      hex = 0x34bac8 },
-        { c = colors.lightBlue, hex = 0x6cc0f2 },
-        { c = colors.blue,      hex = 0x0096ff },
-        { c = colors.purple,    hex = 0xb156ee },
-        { c = colors.pink,      hex = 0xf26ba2 },
-        { c = colors.magenta,   hex = 0xf9488a },
-        { c = colors.white,     hex = 0xf0f0f0 },
-        { c = colors.lightGray, hex = 0xcacaca },
-        { c = colors.gray,      hex = 0x575757 },
-        { c = colors.black,     hex = 0x191919 },
-        { c = colors.brown,     hex = 0x7f664c }
-    },
 
     -- color re-mappings for assistive modes
-    color_modes = {
+    color_modes = themes.smooth_stone.color_modes
-        -- standard
-        {},
-        -- deuteranopia
-        {
-            { c = colors.blue,   hex = 0x1081ff },
-            { c = colors.yellow, hex = 0xf7c311 },
-            { c = colors.red,    hex = 0xfb5615 },
-        },
-        -- protanopia
-        {
-            { c = colors.blue,   hex = 0x1081ff },
-            { c = colors.yellow, hex = 0xf5e633 },
-            { c = colors.red,    hex = 0xff521a },
-        },
-        -- tritanopia
-        {
-            { c = colors.blue,   hex = 0x40cbd7 },
-            { c = colors.yellow, hex = 0xffbc00 },
-            { c = colors.red,    hex = 0xff0000 },
-        }
-    }
 }
 
 ---@type theme
@@ -113,48 +75,10 @@ local deepslate = {
     highlight_box_bright = cpair(colors.black, colors.lightGray),
     field_box = cpair(colors.white, colors.gray),
 
-    colors = {
+    colors = themes.deepslate.colors,
-        { c = colors.red,       hex = 0xeb6a6c },
-        { c = colors.orange,    hex = 0xf2b86c },
-        { c = colors.yellow,    hex = 0xd9cf81 },
-        { c = colors.lime,      hex = 0x80ff80 },
-        { c = colors.green,     hex = 0x70e19b },
-        { c = colors.cyan,      hex = 0x7ccdd0 },
-        { c = colors.lightBlue, hex = 0x99ceef },
-        { c = colors.blue,      hex = 0x60bcff },
-        { c = colors.purple,    hex = 0xc38aea },
-        { c = colors.pink,      hex = 0xff7fb8 },
-        { c = colors.magenta,   hex = 0xf980dd },
-        { c = colors.white,     hex = 0xd9d9d9 },
-        { c = colors.lightGray, hex = 0x949494 },
-        { c = colors.gray,      hex = 0x575757 },
-        { c = colors.black,     hex = 0x262626 },
-        { c = colors.brown,     hex = 0xb18f6a }
-    },
 
     -- color re-mappings for assistive modes
-    color_modes = {
+    color_modes = themes.deepslate.color_modes
-        -- standard
-        {},
-        -- deuteranopia
-        {
-            { c = colors.blue,   hex = 0x65aeff },
-            { c = colors.yellow, hex = 0xf7c311 },
-            { c = colors.red,    hex = 0xfb5615 },
-        },
-        -- protanopia
-        {
-            { c = colors.blue,   hex = 0x65aeff },
-            { c = colors.yellow, hex = 0xf5e633 },
-            { c = colors.red,    hex = 0xff8058 },
-        },
-        -- tritanopia
-        {
-            { c = colors.blue,   hex = 0x00ecff },
-            { c = colors.yellow, hex = 0xffbc00 },
-            { c = colors.red,    hex = 0xdf4949 },
-        }
-    }
 }
 
 style.theme = smooth_stone

graphics/themes.lua

@@ -241,4 +241,100 @@ end
 
 --#endregion
 
+--#region Main UI Color Palettes
+
+---@class ui_palette
+themes.smooth_stone = {
+    colors = {
+        { c = colors.red,       hex = 0xdf4949 },
+        { c = colors.orange,    hex = 0xffb659 },
+        { c = colors.yellow,    hex = 0xfffc79 },
+        { c = colors.lime,      hex = 0x80ff80 },
+        { c = colors.green,     hex = 0x4aee8a },
+        { c = colors.cyan,      hex = 0x34bac8 },
+        { c = colors.lightBlue, hex = 0x6cc0f2 },
+        { c = colors.blue,      hex = 0x0096ff },
+        { c = colors.purple,    hex = 0xb156ee },
+        { c = colors.pink,      hex = 0xf26ba2 },
+        { c = colors.magenta,   hex = 0xf9488a },
+        { c = colors.white,     hex = 0xf0f0f0 },
+        { c = colors.lightGray, hex = 0xcacaca },
+        { c = colors.gray,      hex = 0x575757 },
+        { c = colors.black,     hex = 0x191919 },
+        { c = colors.brown,     hex = 0x7f664c }
+    },
+
+    -- color re-mappings for assistive modes
+    color_modes = {
+        -- standard
+        {},
+        -- deuteranopia
+        {
+            { c = colors.blue,   hex = 0x1081ff },
+            { c = colors.yellow, hex = 0xf7c311 },
+            { c = colors.red,    hex = 0xfb5615 },
+        },
+        -- protanopia
+        {
+            { c = colors.blue,   hex = 0x1081ff },
+            { c = colors.yellow, hex = 0xf5e633 },
+            { c = colors.red,    hex = 0xff521a },
+        },
+        -- tritanopia
+        {
+            { c = colors.blue,   hex = 0x40cbd7 },
+            { c = colors.yellow, hex = 0xffbc00 },
+            { c = colors.red,    hex = 0xff0000 },
+        }
+    }
+}
+
+---@class ui_palette
+themes.deepslate = {
+    colors = {
+        { c = colors.red,       hex = 0xeb6a6c },
+        { c = colors.orange,    hex = 0xf2b86c },
+        { c = colors.yellow,    hex = 0xd9cf81 },
+        { c = colors.lime,      hex = 0x80ff80 },
+        { c = colors.green,     hex = 0x70e19b },
+        { c = colors.cyan,      hex = 0x7ccdd0 },
+        { c = colors.lightBlue, hex = 0x99ceef },
+        { c = colors.blue,      hex = 0x60bcff },
+        { c = colors.purple,    hex = 0xc38aea },
+        { c = colors.pink,      hex = 0xff7fb8 },
+        { c = colors.magenta,   hex = 0xf980dd },
+        { c = colors.white,     hex = 0xd9d9d9 },
+        { c = colors.lightGray, hex = 0x949494 },
+        { c = colors.gray,      hex = 0x575757 },
+        { c = colors.black,     hex = 0x262626 },
+        { c = colors.brown,     hex = 0xb18f6a }
+    },
+
+    -- color re-mappings for assistive modes
+    color_modes = {
+        -- standard
+        {},
+        -- deuteranopia
+        {
+            { c = colors.blue,   hex = 0x65aeff },
+            { c = colors.yellow, hex = 0xf7c311 },
+            { c = colors.red,    hex = 0xfb5615 },
+        },
+        -- protanopia
+        {
+            { c = colors.blue,   hex = 0x65aeff },
+            { c = colors.yellow, hex = 0xf5e633 },
+            { c = colors.red,    hex = 0xff8058 },
+        },
+        -- tritanopia
+        {
+            { c = colors.blue,   hex = 0x00ecff },
+            { c = colors.yellow, hex = 0xffbc00 },
+            { c = colors.red,    hex = 0xdf4949 },
+        }
+    }
+}
+
+--#endregion
+
 return themes

pocket/configure.lua

@@ -7,6 +7,7 @@ local tcd         = require("scada-common.tcd")
 local util        = require("scada-common.util")
 
 local core        = require("graphics.core")
+local themes      = require("graphics.themes")
 
 local DisplayBox  = require("graphics.elements.displaybox")
 local Div         = require("graphics.elements.div")
@@ -41,21 +42,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)

reactor-plc/configure.lua

@@ -50,21 +50,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
@@ -479,30 +465,26 @@ local function config_view(display)
     TextBox{parent=clr_c_2,x=1,y=1,height=6,text="By default, this project uses green/red heavily to distinguish ok and not, with some indicators also using multiple colors. By selecting a color blindness below, blues will be used instead of greens on indicators and multi-color indicators will be split up as space permits."}
 
     local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
         if value == 1 then
             for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
-        elseif value == themes.COLOR_MODE.DEUTERANOPIA then
+        else
-            term.setPaletteColor(colors.green, 0x1081ff)
+            term.setPaletteColor(colors.green, c[1].hex)
-            term.setPaletteColor(colors.yellow, 0xf7c311)
+            term.setPaletteColor(colors.yellow, c[2].hex)
-            term.setPaletteColor(colors.red, 0xfb5615)
+            term.setPaletteColor(colors.red, c[3].hex)
-        elseif value == themes.COLOR_MODE.PROTANOPIA then
-            term.setPaletteColor(colors.green, 0x1081ff)
-            term.setPaletteColor(colors.yellow, 0xf5e633)
-            term.setPaletteColor(colors.red, 0xff521a)
-        elseif value == themes.COLOR_MODE.TRITANOPIA then
-            term.setPaletteColor(colors.green, 0x00ecff)
-            term.setPaletteColor(colors.yellow, 0xffbc00)
-            term.setPaletteColor(colors.red, 0xff0000)
         end
     end
 
-    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+    TextBox{parent=clr_c_2,x=1,y=8,height=1,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=9,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
 
-    local _ = IndLight{parent=clr_c_2,x=20,y=8,label="Good",colors=cpair(colors.black,colors.green),value=true}
+    TextBox{parent=clr_c_2,x=20,y=8,height=1,text="Preview"}
-    _ = IndLight{parent=clr_c_2,x=20,y=9,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    local _ = IndLight{parent=clr_c_2,x=20,y=9,label="Good",colors=cpair(colors.black,colors.green),value=true}
-    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Bad",colors=cpair(colors.black,colors.red),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=11,label="Bad",colors=cpair(colors.black,colors.red),value=true}
 
-    TextBox{parent=clr_c_2,x=20,y=12,height=6,text="Exact color varies by theme.",fg_bg=g_lg_fg_bg}
+    TextBox{parent=clr_c_2,x=1,y=14,height=6,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
 
     PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 

rtu/configure.lua

@@ -102,21 +102,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
@@ -534,30 +520,26 @@ local function config_view(display)
     TextBox{parent=clr_c_2,x=1,y=1,height=6,text="By default, this project uses green/red heavily to distinguish ok and not, with some indicators also using multiple colors. By selecting a color blindness below, blues will be used instead of greens on indicators and multi-color indicators will be split up as space permits."}
 
     local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
         if value == 1 then
             for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
-        elseif value == themes.COLOR_MODE.DEUTERANOPIA then
+        else
-            term.setPaletteColor(colors.green, 0x1081ff)
+            term.setPaletteColor(colors.green, c[1].hex)
-            term.setPaletteColor(colors.yellow, 0xf7c311)
+            term.setPaletteColor(colors.yellow, c[2].hex)
-            term.setPaletteColor(colors.red, 0xfb5615)
+            term.setPaletteColor(colors.red, c[3].hex)
-        elseif value == themes.COLOR_MODE.PROTANOPIA then
-            term.setPaletteColor(colors.green, 0x1081ff)
-            term.setPaletteColor(colors.yellow, 0xf5e633)
-            term.setPaletteColor(colors.red, 0xff521a)
-        elseif value == themes.COLOR_MODE.TRITANOPIA then
-            term.setPaletteColor(colors.green, 0x00ecff)
-            term.setPaletteColor(colors.yellow, 0xffbc00)
-            term.setPaletteColor(colors.red, 0xff0000)
         end
     end
 
-    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+    TextBox{parent=clr_c_2,x=1,y=8,height=1,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=9,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
 
-    local _ = IndLight{parent=clr_c_2,x=20,y=8,label="Good",colors=cpair(colors.black,colors.green),value=true}
+    TextBox{parent=clr_c_2,x=20,y=8,height=1,text="Preview"}
-    _ = IndLight{parent=clr_c_2,x=20,y=9,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    local _ = IndLight{parent=clr_c_2,x=20,y=9,label="Good",colors=cpair(colors.black,colors.green),value=true}
-    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Bad",colors=cpair(colors.black,colors.red),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=11,label="Bad",colors=cpair(colors.black,colors.red),value=true}
 
-    TextBox{parent=clr_c_2,x=20,y=12,height=6,text="Exact color varies by theme.",fg_bg=g_lg_fg_bg}
+    TextBox{parent=clr_c_2,x=1,y=14,height=6,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
 
     PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 

supervisor/configure.lua

@@ -47,21 +47,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
@@ -778,30 +764,26 @@ local function config_view(display)
     TextBox{parent=clr_c_2,x=1,y=1,height=6,text="By default, this project uses green/red heavily to distinguish ok and not, with some indicators also using multiple colors. By selecting a color blindness below, blues will be used instead of greens on indicators and multi-color indicators will be split up as space permits."}
 
     local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
         if value == 1 then
             for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
-        elseif value == themes.COLOR_MODE.DEUTERANOPIA then
+        else
-            term.setPaletteColor(colors.green, 0x1081ff)
+            term.setPaletteColor(colors.green, c[1].hex)
-            term.setPaletteColor(colors.yellow, 0xf7c311)
+            term.setPaletteColor(colors.yellow, c[2].hex)
-            term.setPaletteColor(colors.red, 0xfb5615)
+            term.setPaletteColor(colors.red, c[3].hex)
-        elseif value == themes.COLOR_MODE.PROTANOPIA then
-            term.setPaletteColor(colors.green, 0x1081ff)
-            term.setPaletteColor(colors.yellow, 0xf5e633)
-            term.setPaletteColor(colors.red, 0xff521a)
-        elseif value == themes.COLOR_MODE.TRITANOPIA then
-            term.setPaletteColor(colors.green, 0x00ecff)
-            term.setPaletteColor(colors.yellow, 0xffbc00)
-            term.setPaletteColor(colors.red, 0xff0000)
         end
     end
 
-    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+    TextBox{parent=clr_c_2,x=1,y=8,height=1,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=9,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
 
-    local _ = IndLight{parent=clr_c_2,x=20,y=8,label="Good",colors=cpair(colors.black,colors.green),value=true}
+    TextBox{parent=clr_c_2,x=20,y=8,height=1,text="Preview"}
-    _ = IndLight{parent=clr_c_2,x=20,y=9,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    local _ = IndLight{parent=clr_c_2,x=20,y=9,label="Good",colors=cpair(colors.black,colors.green),value=true}
-    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Bad",colors=cpair(colors.black,colors.red),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=10,label="Warning",colors=cpair(colors.black,colors.yellow),value=true}
+    _ = IndLight{parent=clr_c_2,x=20,y=11,label="Bad",colors=cpair(colors.black,colors.red),value=true}
 
-    TextBox{parent=clr_c_2,x=20,y=12,height=6,text="Exact color varies by theme.",fg_bg=g_lg_fg_bg}
+    TextBox{parent=clr_c_2,x=1,y=14,height=6,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
 
     PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}