diff --git a/Sources/NXVenom/atmosphere/kips/.bak/Venom Defaults.kip b/Sources/NXVenom/atmosphere/kips/.bak/Venom Defaults.kip
index fda3e8f5..22c25951 100644
Binary files a/Sources/NXVenom/atmosphere/kips/.bak/Venom Defaults.kip and b/Sources/NXVenom/atmosphere/kips/.bak/Venom Defaults.kip differ
diff --git a/Sources/NXVenom/atmosphere/kips/loader.kip b/Sources/NXVenom/atmosphere/kips/loader.kip
index fda3e8f5..22c25951 100644
Binary files a/Sources/NXVenom/atmosphere/kips/loader.kip and b/Sources/NXVenom/atmosphere/kips/loader.kip differ
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuHighUV.json b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuHighUV.json
index 6aabfe25..00d59c19 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuHighUV.json	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuHighUV.json	
@@ -34,5 +34,21 @@
   {
     "name": "8",
     "dec": "8"
+  },
+  {
+    "name": "9",
+    "dec": "9"
+  },
+  {
+    "name": "10",
+    "dec": "10"
+  },
+  {
+    "name": "11",
+    "dec": "11"
+  },
+  {
+    "name": "12",
+    "dec": "12"
   }
 ]
\ No newline at end of file
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuUV.json b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuUV.json
index 77b0c53e..6744a809 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuUV.json	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/CPU/json/marikoCpuUV.json	
@@ -34,5 +34,21 @@
   {
     "name": "8",
     "dec": "8"
+  },
+  {
+    "name": "9",
+    "dec": "9"
+  },
+  {
+    "name": "10",
+    "dec": "10"
+  },
+  {
+    "name": "11",
+    "dec": "11"
+  },
+  {
+    "name": "12",
+    "dec": "12"
   }
 ]
\ No newline at end of file
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/GPU/json/commonGpuVoltTable.json b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/GPU/json/commonGpuVoltTable.json
index 46469dfc..f17cce3b 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/GPU/json/commonGpuVoltTable.json	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/GPU/json/commonGpuVoltTable.json	
@@ -1,4 +1,44 @@
 [
+  {
+    "name": "500 mV",
+    "dec": "500"
+  },
+  {
+    "name": "505 mV",
+    "dec": "505"
+  },
+  {
+    "name": "510 mV",
+    "dec": "510"
+  },
+  {
+    "name": "515 mV",
+    "dec": "515"
+  },
+  {
+    "name": "520 mV",
+    "dec": "520"
+  },
+  {
+    "name": "525 mV",
+    "dec": "525"
+  },
+  {
+    "name": "530 mV",
+    "dec": "530"
+  },
+  {
+    "name": "535 mV",
+    "dec": "535"
+  },
+  {
+    "name": "540 mV",
+    "dec": "540"
+  },
+  {
+    "name": "545 mV",
+    "dec": "545"
+  },
   {
     "name": "550 mV",
     "dec": "550"
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/Timing Presets/config.ini b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/Timing Presets/config.ini
new file mode 100644
index 00000000..80b8375a
--- /dev/null
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/Timing Presets/config.ini	
@@ -0,0 +1,126 @@
+-- Samsung
+
+[AA-MGCL]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 1A
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 04
+
+[AM-MGCJ]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 1E
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 03
+
+[AB-MGCL]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 1E
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 03
+
+[MGCH]
+; Erista
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 1E
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 01
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 03
+
+-- Micron ; Mariko
+
+[WT:F]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0D
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0D
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 1E
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 06
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 05
+
+[WT:E]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0F
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0F
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 21
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 04
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 04
+
+[WT:B]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0C
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0C
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 18
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 06
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 05
+
+-- Hynix ; Mariko
+
+[NEE]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0E
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 20
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 06
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 03
+
+[NME]
+; Mariko
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0F
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0F
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 24
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 00
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 01
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 01
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 01
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 01
+
+-- Default
+
+[Venom Default]
+hex-by-cust-offset /atmosphere/kips/loader.kip 88 0F
+hex-by-cust-offset /atmosphere/kips/loader.kip 92 0F
+hex-by-cust-offset /atmosphere/kips/loader.kip 96 21
+hex-by-cust-offset /atmosphere/kips/loader.kip 100 00
+hex-by-cust-offset /atmosphere/kips/loader.kip 104 03
+hex-by-cust-offset /atmosphere/kips/loader.kip 108 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 112 05
+hex-by-cust-offset /atmosphere/kips/loader.kip 116 02
+hex-by-cust-offset /atmosphere/kips/loader.kip 120 02
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/config.ini b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/config.ini
index 7f60b159..bda420e1 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/config.ini	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/config.ini	
@@ -115,3 +115,7 @@ catch_errors
 json_mark_cur_kip '/switch/.packages/SC Wizard/Configure/RAM/json/ramTimingPresetNine.json' name 120
 hex-by-cust-offset-dec /atmosphere/kips/loader.kip 120 {json_mark_cur_kip(*,dec)}
 back
+
+-- Presets
+
+[>Timing Presets]
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/eristaEmcDvbShift.json b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/eristaEmcDvbShift.json
index b4dce37d..334e5f45 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/eristaEmcDvbShift.json	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/eristaEmcDvbShift.json	
@@ -22,5 +22,9 @@
   {
     "name": "5 - +125 mV",
     "dec": "5"
+  },
+  {
+    "name": "5 - +150 mV",
+    "dec": "5"
   }
 ]
\ No newline at end of file
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/marikoEmcDvbShift.json b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/marikoEmcDvbShift.json
index 189d5779..37ec519a 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/marikoEmcDvbShift.json	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/marikoEmcDvbShift.json	
@@ -18,5 +18,9 @@
   {
     "name": "4 - +100 mV",
     "dec": "4"
+  },
+  {
+    "name": "5 - +125 mV",
+    "dec": "4"
   }
 ]
\ No newline at end of file
diff --git a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/ramTimingPresetThree.json b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/ramTimingPresetThree.json
index 0b280292..de809a4d 100644
--- a/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/ramTimingPresetThree.json	
+++ b/Sources/NXVenom/switch/.packages/SC Wizard/Configure/RAM/json/ramTimingPresetThree.json	
@@ -74,5 +74,13 @@
   {
     "name": "19",
     "dec": "19"
+  },
+  {
+    "name": "18",
+    "dec": "18"
+  },
+  {
+    "name": "17",
+    "dec": "17"
   }
 ]
\ No newline at end of file
diff --git a/Sources/Tools/Web Configurator/index.html b/Sources/Tools/Web Configurator/index.html
index 7fe0c259..29918141 100755
--- a/Sources/Tools/Web Configurator/index.html	
+++ b/Sources/Tools/Web Configurator/index.html	
@@ -4,7 +4,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>OC Switchcraft | Overclocking for Horizon OS (HOS) running on Atmosphere CFW.
+  <title>OC Switchcraft EOS | Overclocking for Horizon OS (HOS) running on Atmosphere CFW.
   </title>
   <meta name="description"
     content="Overclocking for Horizon OS (HOS) running on Atmosphere CFW.">
@@ -102,7 +102,7 @@
     </nav>
     <header class="container">
       <hgroup>
-        <h1>OC Switchcraft</h1>
+        <h1>OC Switchcraft EOS</h1>
         <h2>Overclocking for Horizon OS (HOS) running on Atmosphere CFW.</h2>
       </hgroup>
     </header>
@@ -160,7 +160,7 @@ <h3>Features</h3>
                   <li>Unsafe
                     <ul>
                       <li>Due to the limit of board power draw or power IC</li>
-                      <li>Unlockable frequencies up to 2295 / 1267 MHz</li>
+                      <li>Unlockable frequencies up to 2601 / 1305 MHz</li>
                       <li>See <a
                           href="https://github.com/hanai3Bi/Switch-OC-Suite/blob/master/Source/sys-clk-OC/README.md"
                           target="_blank">README
@@ -207,64 +207,6 @@ <h3 id="installation" open>Installation</h3>
             <li>Download latest release</a>.</li>
             <li>Grab <code>loader.kip</code> for your Atmosphere version and
               place it in <code>/atmosphere/kips/</code>.</li>
-            <li>(optional) You can customize via this configurator</a>
-              <table role="grid">
-                <thead>
-                  <tr>
-                    <th>Defaults</th>
-                    <th>Mariko</th>
-                    <th>Erista</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td>CPU OC</td>
-                    <td>2295 MHz Max</td>
-                    <td>2091 MHz Max</td>
-                  </tr>
-                  <tr>
-                    <td>CPU Boost</td>
-                    <td>1785 MHz</td>
-                    <td>N/A</td>
-                  </tr>
-                  <tr>
-                    <td>CPU Volt</td>
-                    <td>1235 mV Max</td>
-                    <td>1235 mV Max</td>
-                  </tr>
-                  <tr>
-                    <td>GPU OC</td>
-                    <td>1267 MHz Max</td>
-                    <td>998 MHz Max</td>
-                  </tr>
-                  <tr>
-                    <td>RAM OC</td>
-                    <td>1996 MHz</td>
-                    <td>1862 MHz</td>
-                  </tr>
-                  <tr>
-                    <td>RAM Volt</td>
-                    <td>Disabled</td>
-                    <td>Disabled</td>
-                  </tr>
-                  <tr>
-                    <td>RAM Timing</td>
-                    <td>Auto-Adjusted</td>
-                    <td>Auto-Adjusted</td>
-                  </tr>
-                  <tr>
-                    <td>CPU UV</td>
-                    <td>Disabled</td>
-                    <td>N/A</td>
-                  </tr>
-                  <tr>
-                    <td>GPU UV</td>
-                    <td>Disabled</td>
-                    <td>N/A</td>
-                  </tr>
-                </tbody>
-              </table>
-            </li>
             <li>Hekate-ipl bootloader Only (fss0)
               <ul>
                 <li>At boot entry section in <code>bootloader/hekate_ipl.ini</code>,
diff --git a/Sources/Tools/Web Configurator/loader.kip b/Sources/Tools/Web Configurator/loader.kip
old mode 100755
new mode 100644
index 4bd510a4..e92623ee
Binary files a/Sources/Tools/Web Configurator/loader.kip and b/Sources/Tools/Web Configurator/loader.kip differ
diff --git a/Sources/Tools/Web Configurator/main.js b/Sources/Tools/Web Configurator/main.js
index 281df68d..f3ac5497 100755
--- a/Sources/Tools/Web Configurator/main.js	
+++ b/Sources/Tools/Web Configurator/main.js	
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /* Config: Cust */
-const CUST_REV_ADV = 42;
+const CUST_REV_ADV = 44;
 var CustPlatform;
 (function (CustPlatform) {
     CustPlatform[CustPlatform["Undefined"] = 0] = "Undefined";
@@ -142,7 +142,7 @@ class AdvEntry extends CustEntry {
     }
 }
 class GpuEntry extends CustEntry {
-    constructor(id, name, platform = CustPlatform.Mariko, size = 4, desc = ["range: 550 ≤ x ≤ 1050"], defval = 610, minmax = [550, 1050], step = 5, zeroable = false) {
+    constructor(id, name, platform = CustPlatform.Mariko, size = 4, desc = ["range: 500 ≤ x ≤ 1050"], defval = 610, minmax = [500, 1050], step = 5, zeroable = false) {
         super(id, name, platform, size, desc, defval, minmax, step, zeroable);
         this.id = id;
         this.name = name;
@@ -213,7 +213,7 @@ var CustTable = [
     new CustEntry("commonGpuVoltOffset", "GPU Volt Offset", CustPlatform.All, 4, ["Negative Offset value for gpu dynamic voltage calculation",
         "For example, value of 10 will decrease 10mV gpu volt from all frequencies",
         "Default gpu vmin: Erista - 810mV / Mariko - 610mV",
-        "Acceptable range: 0 ~ 200"], 0, [0, 200], 1),
+        "Acceptable range: 0 ~ 50"], 0, [0, 50], 1),
     new CustEntry("eristaGpuMinVolt", "Erista GPU Vmin", CustPlatform.Erista, 4, ["GPU Vmin for Erista",
         "Default gpu vmin: 810mV",
         "Regulator step: 6.25mV",
@@ -234,10 +234,9 @@ var CustTable = [
         "This means max available GPU freq will be adjusted depending on your speedo",
         "Acceptable range: 800 ~ 850"], 800, [800, 850], 5),
     new CustEntry("mtcConf", "DRAM Timing", CustPlatform.All, 4, ["<b>0</b>: AUTO_ADJ: Auto adjust mtc table with LPDDR4 3733 Mbps specs, 16Gb density. Change timing with Advanced Config (Default)",
-        "<b>1</b>: AUTO_ADJ_HP: Auto adjust only core timings. (Previously CUST_ADJ).",
-		"<b>2</b>: AUTO_ADJ_LV: Less tight timings. It can help to achieve higher frequencies or lower voltages.",
-		"<b>3</b>: AUTO_ADJ_LV_HP: LV mode with slightly tighter timings",
-        "<b>4</b>: NO_ADJ: Use 1600 mtc table wihout adjusting (Timing becomes tighter if you raise dram clock)."], 0, [0, 4], 1),
+		"<b>1</b>: AUTO_ADJ_LV: Less tight timings. It can help to achieve higher frequencies or lower voltages.",
+		"<b>2</b>: AUTO_ADJ_LV_HP: LV mode with slightly tighter timings",
+        "<b>3</b>: NO_ADJ: Use 1600 mtc table wihout adjusting (Timing becomes tighter if you raise dram clock)."], 0, [0, 3], 1),
     new CustEntry("commonEmcMemVolt", "EMC Vdd2 Voltage in uV", CustPlatform.All, 4, ["Acceptable range: 1050000 ≤ x ≤ 1212500, and it should be divided evenly by 12500.",
         "Erista Default: 1125000",
         "Mariko Default: 1100000",
@@ -258,7 +257,7 @@ var CustTable = [
     new CustEntry("commonEmcDvbShift", "EMC DVB Voltage Shift", CustPlatform.All, 4, ["EMC DVB table is EMC clock to SOC voltage mapping",
         "SOC voltage automatically gets raised on higher emc clock with this table",
         "Each shift number raises 25mV more, up to max SoC voltage. Leave at 0 and only raise if unstable",
-        "Acceptable range : 0~4"], 0, [0, 4], 1),
+        "Acceptable range : 0~5"], 0, [0, 5], 1),
 ];
 var AdvTable = [
     new AdvEntry("ramTimingTRCD", "T1 tRCD", CustPlatform.All, 4, ["<b>WARNING</b>: Unstable timings can corrupt your nand",