diff --git a/Source/Configurator/hoc.kip b/Source/Configurator/loader.kip
similarity index 53%
rename from Source/Configurator/hoc.kip
rename to Source/Configurator/loader.kip
index 45326ca1..1aa2a7af 100644
Binary files a/Source/Configurator/hoc.kip and b/Source/Configurator/loader.kip differ
diff --git a/Source/Configurator/src/cpu.py b/Source/Configurator/src/cpu.py
index 16d68877..ba1bcebc 100644
--- a/Source/Configurator/src/cpu.py
+++ b/Source/Configurator/src/cpu.py
@@ -54,10 +54,18 @@ def populate():
 
     dpg.add_combo(
         items=freqs_mhz_cpu_label,
-        default_value="1785.0MHz",
-        label="CPU Boost Frequency",
+        default_value="1963.0MHz",
+        label="Mariko CPU Boost Frequency",
         callback=k.grab_kip_storage_values,
-        tag="commonCpuBoostClock"
+        tag="marikoCpuBoostClock"
+    )
+
+    dpg.add_combo(
+        items=freqs_mhz_cpu_label,
+        default_value="1785.0MHz",
+        label="Erista CPU Boost Frequency",
+        callback=k.grab_kip_storage_values,
+        tag="eristaCpuBoostClock"
     )
 
     dpg.add_separator(label="Voltages")
@@ -100,7 +108,7 @@ def populate():
         callback=k.grab_kip_storage_values_no_mult
     )
 
-    dpg.add_separator(label="Undervolt (Mariko ONLY)")
+    dpg.add_separator(label="Undervolt")
 
     dpg.add_button(
         label="What is this?",
@@ -114,10 +122,27 @@ def populate():
     dpg.add_combo(
         items=list(range(0, 8 + 1, 1)),
         default_value="Default Table",
-        label="Mariko CPU Undervolt",
-        tag="marikoCpuUV",
+        label="Mariko CPU Low Undervolt",
+        tag="marikoCpuUVLow",
         callback=k.grab_kip_storage_values_no_mult
     )
+
+    dpg.add_combo(
+        items=list(range(0, 12 + 1, 1)),
+        default_value="Default Table",
+        label="Mariko CPU High Undervolt",
+        tag="marikoCpuUVHigh",
+        callback=k.grab_kip_storage_values_no_mult
+    )
+
+    dpg.add_combo(
+        items=["Auto (Unimplemented) (0)", "Default (1)", "Tbreak Fifteen Eighty One (2)", "Tbreak Sixteen Eighty Three (3)", "HELIOS (4)"],
+        default_value="Default Table",
+        label="Table Configuration",
+        tag="tableConf",
+        callback=k.grab_kip_storage_values_no_mult
+    )
+
     dpg.add_combo(
         items=list(range(0, 5 + 1, 1)),
         default_value="Default Table",
diff --git a/Source/Configurator/src/defaults.py b/Source/Configurator/src/defaults.py
index 0841e684..aee7c1b1 100644
--- a/Source/Configurator/src/defaults.py
+++ b/Source/Configurator/src/defaults.py
@@ -23,55 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 class Defaults: # This almost always never needs to be updated as pulling from the kip takes priority
     def __init__(self):
         self.autosave = 0
-        self.custrev = 0
-        self.mtc = 0
-        self.commonCpuBoostClock = 1785000
-        self.commonEmcMemVolt = 1175000
-        self.eristaCpuMaxVolt = 1235
-        self.eristaEmcMaxClock = 1862400
-        self.marikoCpuMaxVolt = 1120
-        self.marikoEmcMaxClock = 1996800
-        self.marikoEmcVddqVolt = 600000
-        self.marikoCpuUV = 0
-        self.marikoGpuUV = 0
-        self.eristaCpuUV = 0
-        self.eristaGpuUV = 0
-        self.commonGpuVoltOffset = 0
-        self.marikoEmcDvbShift = 0
-        self.t1_tRCD = 0
-        self.t2_tRP = 0
-        self.t3_tRAS = 0
-        self.t4_tRRD = 0
-        self.t5_tRFC = 0
-        self.t6_tRTW = 0
-        self.t7_tWTR = 0
-        self.t8_tREFI = 0
-        self.mem_burst_latency = 2
-        self.m_freq_76800 = 600
-        self.m_freq_153600 = 600
-        self.m_freq_230400 = 600
-        self.m_freq_307200 = 600
-        self.m_freq_384000 = 600
-        self.m_freq_460800 = 600
-        self.m_freq_537600 = 600
-        self.m_freq_614400 = 600
-        self.m_freq_691200 = 600
-        self.m_freq_768000 = 600
-        self.m_freq_844800 = 605
-        self.m_freq_921600 = 635
-        self.m_freq_998400 = 665
-        self.m_freq_1075200 = 695
-        self.m_freq_1152000 = 730
-        self.m_freq_1228800 = 760
-        self.m_freq_1267200 = 785
-        self.m_freq_1305600 = 800
-        self.m_freq_1344000 = 0
-        self.m_freq_1382400 = 0
-        self.m_freq_1420800 = 0
-        self.m_freq_1459200 = 0
-        self.m_freq_1497600 = 0
-        self.m_freq_1536000 = 0
-        self.high_vddq = 0
-        self.high_vdd2 = 0
-
+        pass
 d = Defaults()
\ No newline at end of file
diff --git a/Source/Configurator/src/settings.py b/Source/Configurator/src/settings.py
index 1cd25eaf..65282019 100644
--- a/Source/Configurator/src/settings.py
+++ b/Source/Configurator/src/settings.py
@@ -61,20 +61,13 @@ variables = [
     ("custRev", "u32"),
     ("mtcConf", "u32"),
     ("hpMode", "u32"),
-    ("commonCpuBoostClock", "u32"),
+
     ("commonEmcMemVolt", "u32"),
-    ("eristaCpuMaxVolt", "u32"),
     ("eristaEmcMaxClock", "u32"),
-    ("marikoCpuMaxVolt", "u32"),
     ("marikoEmcMaxClock", "u32"),
     ("marikoEmcVddqVolt", "u32"),
-    ("marikoCpuUV", "u32"),
-    ("marikoGpuUV", "u32"),
-    ("eristaCpuUV", "u32"),
-    ("eristaGpuUV", "u32"),
-    ("commonGpuVoltOffset", "u32"),
     ("marikoEmcDvbShift", "u32"),
-    # advanced config
+
     ("t1_tRCD", "u32"),
     ("t2_tRP", "u32"),
     ("t3_tRAS", "u32"),
@@ -83,40 +76,36 @@ variables = [
     ("t6_tRTW", "u32"),
     ("t7_tWTR", "u32"),
     ("t8_tREFI", "u32"),
+
     ("mem_burst_read_latency", "u32"),
     ("mem_burst_write_latency", "u32"),
-    ("marikoCpuHighVmin", "u32"),
+
+    ("eristaCpuUV", "u32"),
+    ("eristaCpuMaxVolt", "u32"),
+
+    ("marikoCpuUVLow", "u32"),
+    ("marikoCpuUVHigh", "u32"),
+    ("tableConf", "u32"),
     ("marikoCpuLowVmin", "u32"),
+    ("marikoCpuHighVmin", "u32"),
+    ("marikoCpuMaxVolt", "u32"),
+
+    ("marikoCpuBoostClock", "u32"),
+    ("eristaCpuBoostClock", "u32"),
+
+    ("eristaGpuUV", "u32"),
     ("eristaGpuVmin", "u32"),
+
+    ("marikoGpuUV", "u32"),
     ("marikoGpuVmin", "u32"),
     ("marikoGpuVmax", "u32"),
 
+    ("commonGpuVoltOffset", "u32"),
+    # advanced config
+
+
     ("marikoGpuFullUnlock", "u32"),
 
-    ("g_volt_76800", "u32"),
-    ("g_volt_153600", "u32"),
-    ("g_volt_230400", "u32"),
-    ("g_volt_307200", "u32"),
-    ("g_volt_384000", "u32"),
-    ("g_volt_460800", "u32"),
-    ("g_volt_537600", "u32"),
-    ("g_volt_614400", "u32"),
-    ("g_volt_691200", "u32"),
-    ("g_volt_768000", "u32"),
-    ("g_volt_844800", "u32"),
-    ("g_volt_921600", "u32"),
-    ("g_volt_998400", "u32"),
-    ("g_volt_1075200", "u32"),
-    ("g_volt_1152000", "u32"),
-    ("g_volt_1228800", "u32"),
-    ("g_volt_1267200", "u32"),
-    ("g_volt_1305600", "u32"),
-    ("g_volt_1344000", "u32"),
-    ("g_volt_1382400", "u32"),
-    ("g_volt_1420800", "u32"),
-    ("g_volt_1459200", "u32"),
-    ("g_volt_1497600", "u32"),
-    ("g_volt_1536000", "u32"),
 
     
     ("g_volt_e_76800", "u32"),
@@ -149,6 +138,30 @@ variables = [
 #    ("g_volt_e_1152000", "u32"),
 #    ("g_volt_e_1228800", "u32"),
 
+    ("g_volt_76800", "u32"),
+    ("g_volt_153600", "u32"),
+    ("g_volt_230400", "u32"),
+    ("g_volt_307200", "u32"),
+    ("g_volt_384000", "u32"),
+    ("g_volt_460800", "u32"),
+    ("g_volt_537600", "u32"),
+    ("g_volt_614400", "u32"),
+    ("g_volt_691200", "u32"),
+    ("g_volt_768000", "u32"),
+    ("g_volt_844800", "u32"),
+    ("g_volt_921600", "u32"),
+    ("g_volt_998400", "u32"),
+    ("g_volt_1075200", "u32"),
+    ("g_volt_1152000", "u32"),
+    ("g_volt_1228800", "u32"),
+    ("g_volt_1267200", "u32"),
+    ("g_volt_1305600", "u32"),
+    ("g_volt_1344000", "u32"),
+    ("g_volt_1382400", "u32"),
+    ("g_volt_1420800", "u32"),
+    ("g_volt_1459200", "u32"),
+    ("g_volt_1497600", "u32"),
+    ("g_volt_1536000", "u32"),
 
 ]
 
@@ -156,26 +169,18 @@ fmt_map = {
     "u32": "I",
     "double": "d",
 }
-
 def load_all_vars():
     c.load_entry_object("custRev", 0)
     c.load_entry_object("mtcConf", 0)
     c.load_entry_object("hpMode", 0)
-    c.load_entry_object("commonCpuBoostClock", 1)
+
     c.load_entry_object("commonEmcMemVolt", 2)
-    c.load_entry_object("eristaCpuMaxVolt", 3)
     c.load_entry_object("eristaEmcMaxClock", 1)
-    c.load_entry_object("marikoCpuMaxVolt", 3)
     c.load_entry_object("marikoEmcMaxClock", 1)
     c.load_entry_object("marikoEmcVddqVolt", 2)
-    c.load_entry_object("marikoCpuUV", 5)
-    c.load_entry_object("marikoGpuUV", 4)
-    c.load_entry_object("eristaCpuUV", 5)
-    c.load_entry_object("eristaGpuUV", 4)
-    c.load_entry_object("commonGpuVoltOffset", 3)
     c.load_entry_object("marikoEmcDvbShift", 0)
 
-    # Advanced memory config
+    # === Advanced memory config ===
     c.load_entry_object("t1_tRCD", 5)
     c.load_entry_object("t2_tRP", 5)
     c.load_entry_object("t3_tRAS", 5)
@@ -184,32 +189,52 @@ def load_all_vars():
     c.load_entry_object("t6_tRTW", 5)
     c.load_entry_object("t7_tWTR", 5)
     c.load_entry_object("t8_tREFI", 5)
+
     c.load_entry_object("mem_burst_read_latency", 5)
     c.load_entry_object("mem_burst_write_latency", 5)
-    c.load_entry_object("marikoCpuHighVmin", 3)
+    # === CPU Voltages ===
+    c.load_entry_object("eristaCpuUV", 5)
+    c.load_entry_object("eristaCpuMaxVolt", 3)
+
+    c.load_entry_object("marikoCpuUVLow", 5)
+    c.load_entry_object("marikoCpuUVHigh", 5)
+    c.load_entry_object("tableConf", 5)
     c.load_entry_object("marikoCpuLowVmin", 3)
+    c.load_entry_object("marikoCpuHighVmin", 3)
+    c.load_entry_object("marikoCpuMaxVolt", 3)
+
+    c.load_entry_object("marikoCpuBoostClock", 1)
+    c.load_entry_object("eristaCpuBoostClock", 1)
+
+    # === GPU Voltages ===
+    c.load_entry_object("eristaGpuUV", 4)
     c.load_entry_object("eristaGpuVmin", 3)
+
+    c.load_entry_object("marikoGpuUV", 4)
     c.load_entry_object("marikoGpuVmin", 3)
     c.load_entry_object("marikoGpuVmax", 3)
 
+    c.load_entry_object("commonGpuVoltOffset", 3)
     c.load_entry_object("marikoGpuFullUnlock", 3)
-    # GPU voltage arrays
-    for freq in [
+
+    erista_freqs = [
+        "76800", "115200", "153600", "192000", "230400", "268800", "307200",
+        "345600", "384000", "422400", "460800", "499200", "537600", "576000",
+        "614400", "652800", "691200", "729600", "768000", "806400", "844800",
+        "883200", "921600", "960000", "998400", "1036800", "1075200"
+    ]
+    for freq in erista_freqs:
+        c.load_entry_object(f"g_volt_e_{freq}", 3)
+
+    mariko_freqs = [
         "76800", "153600", "230400", "307200", "384000", "460800", "537600",
         "614400", "691200", "768000", "844800", "921600", "998400", "1075200",
         "1152000", "1228800", "1267200", "1305600", "1344000", "1382400",
         "1420800", "1459200", "1497600", "1536000"
-    ]:
+    ]
+    for freq in mariko_freqs:
         c.load_entry_object(f"g_volt_{freq}", 3)
-
-    for e_freq in [
-        "76800", "115200", "153600", "192000", "230400", "268800", "307200", "345600", "384000", "422400", "460800", "499200", "537600",
-        "576000","614400", "652800","691200","729600", "768000","806400", "844800","883200", "921600","960000", "998400","1036800", "1075200"# ,
-        # "1152000", "1228800"
-    ]:
-        c.load_entry_object(f"g_volt_e_{e_freq}", 3)
-
-
+    
 # Timings
 
 timing_vars = [
@@ -586,11 +611,11 @@ skin_t_entries = {
 
 mariko_meme_threshold = 1536000
 
-mariko_dangerous_gpu_threshold = 1382400
-mariko_unsafe_gpu_threshold = 1152000
+mariko_dangerous_gpu_threshold = 1305600
+mariko_unsafe_gpu_threshold = 998000
 
-erista_dangerous_gpu_threshold = 1151000
-erista_unsafe_gpu_threshold = 922000
+erista_dangerous_gpu_threshold = 1076000
+erista_unsafe_gpu_threshold = 884000
 
 mariko_voltage_step = 5
 erista_voltage_step = 5