chore: depricate exosphere patch

remove charge current from overlay
sysclk: fix ui issues
2026-02-13 19:53:13 -05:00 · 2026-02-13 19:35:40 -05:00 · 2026-02-13 19:33:42 -05:00 · 2026-02-13 19:12:01 -05:00 · 2026-02-13 16:36:04 -05:00 · 2026-02-13 16:33:31 -05:00
130 changed files with 1993 additions and 2670 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,163 @@
+name: Build Horizon OC Zeus
+
+on:
+  push:
+    branches: [ develop, main, master ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    # Minimal devkitA64 container
+    container:
+      image: devkitpro/devkita64:20251231
+
+    steps:
+      - name: Checkout repository and submodules # needed for hoc-clk
+        uses: actions/checkout@v6.0.2
+        with:
+          submodules: recursive
+
+
+      # -------------------------------------------------
+      # Fix PATH for devkitA64 and devkitARM
+      # -------------------------------------------------
+      - name: Set devkitPro PATH
+        run: |
+          echo "DEVKITPRO=/opt/devkitpro" >> $GITHUB_ENV
+          echo "DEVKITA64=/opt/devkitpro/devkitA64" >> $GITHUB_ENV
+          echo "DEVKITARM=/opt/devkitpro/devkitARM" >> $GITHUB_ENV
+          echo "PATH=/opt/devkitpro/devkitA64/bin:/opt/devkitpro/devkitARM/bin:$PATH" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Check devkitPro gcc and g++ versions
+        run: |
+          aarch64-none-elf-gcc --version
+          aarch64-none-elf-g++ --version
+        shell: bash # is this even needed? but for consistency let's keep using it
+
+      - name: Install ccache
+        run: |
+          apt-get update
+          apt-get install -y ccache
+        shell: bash
+
+      # -------------------------------------------------
+      # Get short commit SHA
+      # -------------------------------------------------
+      - name: Set commit SHA & dist
+        id: vars
+        run: |
+          echo "SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
+          echo $SHORT_SHA > dist/.commit
+          echo $GITHUB_SHA >> dist/.commit
+
+      - name: Clone Atmosphere
+        run: git clone --depth=1 --single-branch https://github.com/Atmosphere-NX/Atmosphere.git atmosphere -b $(cat ams_ver.txt)
+
+      - name: Prepare build folder
+        run: |
+          mkdir -p build
+          cp -r atmosphere/* build/
+
+      - name: Override ldr_process_creation.cpp
+        run: |
+          cp -rf Source/Atmosphere/stratosphere/loader/source/* build/stratosphere/loader/source/
+
+      - name: Cache ccache
+        uses: actions/cache@v5.0.3
+        with:
+          path: /root/.cache/ccache
+          key: ccache-${{ runner.os }}-devkitpro-ams-${{ hashFiles('ams_ver.txt') }} # last key was utter garbage, stick to ams versions, 
+          restore-keys: |
+            ccache-${{ runner.os }}-devkitpro-
+
+      - name: Configure ccache
+        run: |
+          export CCACHE_DIR=/root/.cache/ccache
+          echo "CCACHE_DIR=/root/.cache/ccache" >> $GITHUB_ENV
+          ccache --set-config=max_size=10G
+          ccache --set-config=compiler_check=content
+          ccache --zero-stats
+          
+      - name: Build hoc-clk sysmodule and overlay
+        shell: bash
+        run: |
+          export CC="ccache aarch64-none-elf-gcc"
+          export CXX="ccache aarch64-none-elf-g++"
+
+          ROOT_DIR="$GITHUB_WORKSPACE/Source/sys-clk"
+          DIST_DIR="$ROOT_DIR/dist"
+          
+          mkdir -p "$DIST_DIR"
+
+          echo "*** sysmodule ***"
+
+          TITLE_ID="$(grep -oP '"title_id":\s*"0x\K(\w+)' \
+            "$ROOT_DIR/sysmodule/perms.json")"
+
+          echo "TITLE_ID: $TITLE_ID"
+
+          pushd "$ROOT_DIR/sysmodule"
+          make -j$(($(nproc) * 2)) CXX="ccache aarch64-none-elf-g++" CC="ccache aarch64-none-elf-gcc"
+          popd
+
+          mkdir -p "$DIST_DIR/atmosphere/contents/$TITLE_ID/flags"
+
+          cp -vf \
+            "$ROOT_DIR/sysmodule/out/horizon-oc.nsp" \
+            "$DIST_DIR/atmosphere/contents/$TITLE_ID/exefs.nsp"
+
+          : >"$DIST_DIR/atmosphere/contents/$TITLE_ID/flags/boot2.flag"
+
+          cp -vf \
+            "$ROOT_DIR/sysmodule/toolbox.json" \
+            "$DIST_DIR/atmosphere/contents/$TITLE_ID/toolbox.json"
+
+          echo "*** overlay ***"
+
+          pushd "$ROOT_DIR/overlay"
+          make -j$(($(nproc) * 2)) CXX="ccache aarch64-none-elf-g++" CC="ccache aarch64-none-elf-gcc"
+          popd
+
+          mkdir -p "$DIST_DIR/switch/.overlays"
+
+          cp -vf \
+            "$ROOT_DIR/overlay/out/horizon-oc-overlay.ovl" \
+            "$DIST_DIR/switch/.overlays/horizon-oc-overlay.ovl"
+
+          echo "*** assets ***"
+
+          mkdir -p "$DIST_DIR/config/horizon-oc"
+
+          cp -vf \
+            "$ROOT_DIR/config.ini.template" \
+            "$DIST_DIR/config/horizon-oc/config.ini.template"
+
+          cp -vf \
+            "$ROOT_DIR/README.md" \
+            "$DIST_DIR/README.md"
+
+      - name: Build kip
+        working-directory: build/stratosphere/loader
+        run: |
+          export CC="ccache aarch64-none-elf-gcc"
+          export CXX="ccache aarch64-none-elf-g++"
+          make -j$(($(nproc) * 4)) CXX="ccache aarch64-none-elf-g++" CC="ccache aarch64-none-elf-gcc"
+          hactool -t kip1 out/nintendo_nx_arm64_armv8a/release/loader.kip --uncompress=hoc.kip
+          cp hoc.kip ../../../dist/atmosphere/kips/hoc.kip
+          
+      - name: ccache stats
+        run: ccache --show-stats
+
+      # -------------------------------------------------
+      # Upload ZIP artifact
+      # -------------------------------------------------
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: horizon-oc-zeus-dist
+          path: dist/
+          compression-level: 3
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@

 ![License: GPL-2.0](https://img.shields.io/badge/GPL--2.0-red?style=for-the-badge)
 ![Nintendo Switch](https://img.shields.io/badge/Nintendo_Switch-E60012?style=for-the-badge\&logo=nintendo-switch\&logoColor=white)
-[![Discord](https://img.shields.io/badge/Discord-5865F2?style=for-the-badge\&logo=discord\&logoColor=white)](https://discord.com/invite/S3eX47dHsB)
+[![Discord](https://img.shields.io/badge/Discord-5865F2?style=for-the-badge\&logo=discord\&logoColor=white)](https://dsc.gg/horizonoc)
 ![VSCode](https://img.shields.io/badge/VSCode-0078D4?style=for-the-badge\&logo=visual%20studio%20code\&logoColor=white)
 ![Made with Notepad++](assets/np++.png?raw=true)
 ![C++](https://img.shields.io/badge/C%2B%2B-00599C?style=for-the-badge\&logo=c%2B%2B\&logoColor=white)
@@ -41,9 +41,7 @@ It enables advanced CPU, GPU, and RAM tuning with user-friendly configuration to
 * Built-in configurator
 * Compatible with most homebrew

-> *Higher (potentially dangerous) frequencies are unlockable via configuration.*
-> *Erista and Mariko units can usually push a bit further fully safely with a bit of undervolting, however this may not work on all units.*
-> *The exact maximum overclock possible varies per console, although most consoles should be able to do this safely.*
+> It is reccomended to read the [guide](https://rentry.co/howtoget60fps) before proceeding, as this can help you get a *significant* performance boost over the default settings, often times with less power draw and heat output

 ---

@@ -69,7 +67,7 @@ It enables advanced CPU, GPU, and RAM tuning with user-friendly configuration to

 1. Open the Horizon OC Overlay
 2. Open the settings menu
-3. Adjust your overclocking settings as desired.
+3. Adjust your overclocking settings as desired. A helpful guide can be found [here.](https://rentry.co/mariko#oc-settings-for-horizon-oc)
 4. Click **Save KIP Settings** to apply your configuration.

 ---
@@ -78,6 +76,73 @@ It enables advanced CPU, GPU, and RAM tuning with user-friendly configuration to

 Refer to COMPILATION.md

+---
+## Clock table
+
+### MEM clocks
+* 3200 → max on mariko, JEDEC.
+* 2933 → JEDEC.
+* 2666 → JEDEC.
+* 2400 → max on erista, JEDEC.
+* 2133 → mariko safe max (4266 Modules), JEDEC.
+* 1996 → JEDEC.
+* 1866 → mariko safe max (3733 Modules), JEDEC.
+* 1600 → official docked, boost mode, erista safe max, JEDEC.
+* 1331 → official handheld, JEDEC.
+* 1065
+* 800
+* 665
+
+### CPU clocks
+* 2601 → mariko absolute max, very dangerous
+* 2499
+* 2397 → mariko safe max with UV (low speedo)
+* 2295
+* 2193
+* 2091
+* 1963 → mariko no UV max clock
+* 1887
+* 1785 → erista no UV max clock, boost mode
+* 1683
+* 1581
+* 1428
+* 1326
+* 1224 → sdev oc
+* 1122
+* 1020 → official docked & handheld
+* 918
+* 816
+* 714
+* 612 → sleep mode
+
+### GPU clocks
+* 1536 → absolute max clock on mariko. very dangerous
+* 1459
+* 1382
+* 1305
+* 1267 → NVIDIA T214 rating
+* 1228 → mariko HiOPT safe clock
+* 1152 → mariko SLT max clock
+* 1075 → mariko no UV max clock. absolute max clock on erista. very dangerous
+* 998 → NVIDIA T210 rating
+* 960 (erista only) → erista slt/hiopt safe max clock
+* 921 → erista no UV max clock
+* 844
+* 768 → official docked
+* 691
+* 614
+* 537
+* 460 → max handheld
+* 384 → official handheld
+* 307 → official handheld
+* 230
+* 153
+* 76 → boost mode
+
+**Notes:**
+1. GPU overclock is capped at 460MHz in handheld and capped at 768MHz if charging, unless you're using the official charger.
+2. Clocks higher than 768MHz need the official charger is plugged in.
+
 ---

 ## Credits
@@ -86,6 +151,7 @@ Refer to COMPILATION.md
 * **Souldbminer** – hoc-clk and loader development
 * **Lightos** – loader patches development
 * **SciresM** - Atmosphere CFW
+* **CTCaer** - L4T, Hekate, perfect ram timings
 * **KazushiMe** – Switch OC Suite
 * **hanai3bi (meha)** – Switch OC Suite, EOS, sys-clk-eos
 * **NaGaa95** – L4T-OC-kernel
@@ -95,4 +161,4 @@ Refer to COMPILATION.md
 * **MasaGratoR and ZachyCatGames** - General help
 * **MasaGratoR** - Status Monitor & Display Refresh Rate Driver
 * **Dom, Samybigio, Arcdelta, Miki, Happy, Flopsider, Winnerboi77, Blaise, Alvise, TDRR, agjeococh and Xenshen** - Testing
-* **Samybigio2011** - Italian translations
+* **Samybigio2011** - Italian translations
--- a/Source/Atmosphere-Patches/secmon_define_emc_access_table.inc
+++ b/Source/Atmosphere-Patches/secmon_define_emc_access_table.inc
--- a/Source/Atmosphere-Patches/secmon_define_soctherm_access_table.inc
+++ b/Source/Atmosphere-Patches/secmon_define_soctherm_access_table.inc
--- a/Source/Atmosphere-Patches/secmon_emc_access_table_data.inc
+++ b/Source/Atmosphere-Patches/secmon_emc_access_table_data.inc
--- a/Source/Atmosphere-Patches/secmon_memory_layout.hpp
+++ b/Source/Atmosphere-Patches/secmon_memory_layout.hpp
--- a/Source/Atmosphere-Patches/secmon_smc_register_access.cpp
+++ b/Source/Atmosphere-Patches/secmon_smc_register_access.cpp
--- a/Source/Atmosphere-Patches/secmon_soctherm_access_table_data.inc
+++ b/Source/Atmosphere-Patches/secmon_soctherm_access_table_data.inc
--- a/Source/Atmosphere/stratosphere/loader/source/ldr_process_creation.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/ldr_process_creation.cpp
@@ -1,6 +1,8 @@
 /*
 * Copyright (c) Atmosphère-NX
 *
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
+ *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
 * version 2, as published by the Free Software Foundation.
@@ -692,11 +694,11 @@ namespace ams::ldr {

                /* Apply PCV and PTM patches */
                if (g_is_pcv) {
-                    oc::pcv::Patch(map_address, nso_size);
+                    hoc::pcv::Patch(map_address, nso_size);
                }

                if (g_is_ptm) {
-                    oc::ptm::Patch(map_address, nso_size);
+                    hoc::ptm::Patch(map_address, nso_size);
                }
            }

--- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2023 hanai3Bi
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -28,17 +28,17 @@
 #define GPU_MIN_MIN_VOLT 480000
 #define CPU_MAX_MAX_VOLT 1235000

-namespace ams::ldr::oc {
+namespace ams::ldr::hoc {

 volatile CustomizeTable C = {
-
+/* Disables RAM powerdown */
 .hpMode = DISABLED,

-.commonEmcMemVolt  = 1175000, // LPDDR4X JEDEC Specification
-.eristaEmcMaxClock = 1600000, // Maximum HB-MGCH ram rating
+.commonEmcMemVolt  = 1175000, /* LPDDR4X JEDEC Specification */
+.eristaEmcMaxClock = 1600000, /* Maximum HB-MGCH ram rating */

-.marikoEmcMaxClock = 1866000,
-.marikoEmcVddqVolt = 600000,
+.marikoEmcMaxClock = 1866000, /* 1866MHz @ 1866tWRL is guaranteed to work on all Mariko units */
+.marikoEmcVddqVolt = 600000, /* Micron: 600mV, other manafacturers: 640mV */
 .emcDvbShift = 0,

 // Primary
@@ -52,9 +52,7 @@ volatile CustomizeTable C = {
 .t7_tWTR  = 0,
 .t8_tREFI = 0,

-/* Set to 4 read and 2 write for 1866b tWRL. */
-/* For 2133 tWRL: 8 read and 4 write. */
-
+/* You can mix and match different latencies if needed */
 /*
 *  Read:
 *   2133RL = 40
@@ -67,8 +65,9 @@ volatile CustomizeTable C = {
 *   1600WL = 14
 *   1331WL = 12
 */
-.mem_burst_read_latency = 36,
-.mem_burst_write_latency = 16,
+
+.mem_burst_read_latency = RL_1866,
+.mem_burst_write_latency = WL_1866,

 .eristaCpuUV = 0,
 .eristaCpuVmin = 800,
@@ -78,9 +77,11 @@ volatile CustomizeTable C = {

 .marikoCpuUVLow = 0, // No undervolt
 .marikoCpuUVHigh = 0, // No undervolt
+
 .tableConf = DEFAULT_TABLE,
 .marikoCpuLowVmin = 620,
 .marikoCpuHighVmin = 750,
+/* 1120mV is NVIDIA rating */
 .marikoCpuMaxVolt = 1120,

 /* Supported values: 1963000, 2091000, 2193000, 2295000, 2397000, 2499000, 2601000, 2703000. */
@@ -96,22 +97,25 @@ volatile CustomizeTable C = {
 .marikoCpuBoostClock = 1963000, // Default boost clock

 .eristaGpuUV = 0,
-.eristaGpuVmin = 800,
+.eristaGpuVmin = 810,

 .marikoGpuUV = 0,
+
 /* For automatic vmin detection, set this to AUTO. */
+/* vmin past 795mV won't work due to HOS limitation */
+/* Vmin is automatically set to 800mV when SoC temperature is below 20C */
 .marikoGpuVmin = AUTO,

 .marikoGpuVmax = 800,

 .commonGpuVoltOffset = 0,

+/* Speedo is automatically set by hoc-clk on first boot */
 .gpuSpeedo = 1450,

-/* This table is used with a gpu uv mode of 2. */
 /* Setting DEACTIVATED_GPU_FREQ on any freq will disable it and all freqs greater than it. (the latter is a bug :/) */
 /* AUTO: Voltage is optimally chosen; with commonGpuVoltOffset applied. */
-/* AUTO only works up to 1305 GPU on Mariko and 921 GPU on Erista */
+/* AUTO only works up to 1305 GPU on Mariko and 998 GPU on Erista (it is reccomended to manually set your 998MHz voltage though) */
 /* You can overwrite auto with any voltage (in mv) of your choice - offset will not be applied. */

 .eristaGpuVoltArray = {
@@ -159,8 +163,8 @@ volatile CustomizeTable C = {
                    AUTO  /*  921                       */,
                    AUTO  /*  998                       */,
                    AUTO  /* 1075                       */,
-    DEACTIVATED_GPU_FREQ  /* 1152                       */,
-    DEACTIVATED_GPU_FREQ  /* 1228                       */,
+                    AUTO  /* 1152 (SLT / HiOPT Only!)   */,
+                    AUTO  /* 1228 (HiOPT Only!)         */,
    DEACTIVATED_GPU_FREQ  /* 1267 (Disabled by default) */,
    DEACTIVATED_GPU_FREQ  /* 1305 (Disabled by default) */,
    DEACTIVATED_GPU_FREQ  /* 1344 (Disabled by default) */,
@@ -171,6 +175,10 @@ volatile CustomizeTable C = {
    DEACTIVATED_GPU_FREQ  /* 1536 (Disabled by default) */,
 },

+/* Advanced. */
+.fineTune_t6_tRTW = 0,
+.fineTune_t7_tWTR = 0,
+
 /* You shouldn't have to anything past here. */
 .eristaCpuDvfsTable = {
    {  204000, {  721094, }, {                           } },
@@ -327,7 +335,7 @@ volatile CustomizeTable C = {
    { 2703000, { 1838820, -36648, 113, }, { CPU_MAX_MAX_VOLT, } },
 },

-.marikoCpuDvfsTableHelios {
+.marikoCpuDvfsTableExtreme {
    {  204000, {  732856, -17335, 113, }, {                   } },
    {  306000, {  760024, -18195, 113, }, {                   } },
    {  408000, {  789258, -19055, 113, }, {                   } },
@@ -455,7 +463,7 @@ volatile CustomizeTable C = {
    {  921600, { }, {  970060,-10108, -614,-179,  1508, -13 } },
    {  998400, { }, { 1065665,-16075, -497,-179,  3213,   9 } },
    { 1075200, { }, { 1132576,-16093, -648,   0,  1077,  40 } },
-    { 1152000, { }, { 1180029,-14534, -830,   0,  1469, 110 } },
+//  { 1152000, { }, { 1180029,-14534, -830,   0,  1469, 110 } },
 //  { 1228800, { }, { 1248293,-16383, -859,   0,  3722, 313 } },
 //  { 1267200, { }, { 1286399,-17475, -867,   0,  3681, 559 } },
 },
--- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2023 hanai3Bi
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -20,25 +20,47 @@

 #pragma once

-#define CUST_REV 11
+#define CUST_REV 1

 #include "oc_common.hpp"
 #include "pcv/pcv_common.hpp"

-namespace ams::ldr::oc {
+namespace ams::ldr::hoc {

 #include "mtc_timing_table.hpp"

-enum MtcConfig: u32 {
-    AUTO_ADJ = 0,
-    AUTO_ADJ_BL = 1,
-};
-
 enum TableConfig: u32 {
    DEFAULT_TABLE = 1,
    TBREAK_1581 = 2,
    TBREAK_1683 = 3,
-    HELIOS_TABLE = 4,
+    EXTREME_TABLE = 4,
+};
+
+/*
+ *  Read:
+ *   2133RL = 40
+ *   1866RL = 36
+ *   1600RL = 32
+ *   1331RL = 28
+ *  Write:
+ *   2133WL = 18
+ *   1866WL = 16
+ *   1600WL = 14
+ *   1331WL = 12
+ */
+
+enum ReadLatency: u32 {
+    RL_2133 = 40,
+    RL_1866 = 36,
+    RL_1600 = 32,
+    RL_1331 = 28,
+};
+
+enum WriteLatency: u32 {
+    WL_2133 = 18,
+    WL_1866 = 16,
+    WL_1600 = 14,
+    WL_1331 = 12,
 };

 using CustomizeCpuDvfsTable = pcv::cvb_entry_t[pcv::DvfsTableEntryLimit];
@@ -53,16 +75,14 @@ typedef struct CustomizeTable {
    u8  cust[4] = {'C', 'U', 'S', 'T'};
    u32 custRev = CUST_REV;

-    u32 mtcConf;
+    u32 placeholder;
    u32 hpMode;

    u32 commonEmcMemVolt;
    u32 eristaEmcMaxClock;
-
    u32 marikoEmcMaxClock;
    u32 marikoEmcVddqVolt;
    u32 emcDvbShift;
-
    // advanced config
    u32 t1_tRCD;
    u32 t2_tRP;
@@ -101,12 +121,16 @@ typedef struct CustomizeTable {

    u32 commonGpuVoltOffset;

-    /* TODO: Automatically detect speedo. */
    u32 gpuSpeedo;

    u32 eristaGpuVoltArray[27];
    u32 marikoGpuVoltArray[24];

+    u32 fineTune_t6_tRTW;
+    u32 fineTune_t7_tWTR;
+
+    u32 reserved[60];
+
    CustomizeCpuDvfsTable eristaCpuDvfsTable;
    CustomizeCpuDvfsTable eristaCpuDvfsTableSLT;

@@ -114,7 +138,7 @@ typedef struct CustomizeTable {
    CustomizeCpuDvfsTable marikoCpuDvfsTableSLT;
    CustomizeCpuDvfsTable marikoCpuDvfsTable1581Tbreak;
    CustomizeCpuDvfsTable marikoCpuDvfsTable1683Tbreak;
-    CustomizeCpuDvfsTable marikoCpuDvfsTableHelios;
+    CustomizeCpuDvfsTable marikoCpuDvfsTableExtreme;

    CustomizeGpuDvfsTable eristaGpuDvfsTable;
    CustomizeGpuDvfsTable eristaGpuDvfsTableSLT;
--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.cpp
@@ -18,49 +18,16 @@
 #include "../mtc_timing_value.hpp"
 #include "timing_tables.hpp"

-namespace ams::ldr::oc::pcv::mariko {
+namespace ams::ldr::hoc::pcv::mariko {

-    u32 GetRext() {
+    void GetRext() {
        if (auto r = FindRext()) {
-            return r->correct;
+            rext = r->rext;
+            return;
        }
-        return 0x1A;
-    }

-    void CalculateTWTPDEN() {
-        tWTPDEN = tW2P + 1 + CEIL(tDQSS_max / tCK_avg) + CEIL(tDQS2DQ_max / tCK_avg) + 6;
-        if (C.marikoEmcMaxClock >= 2'233'000 && C.marikoEmcMaxClock < 2'533'000) tWTPDEN++;
-        if (C.marikoEmcMaxClock >= 2'433'000 && C.marikoEmcMaxClock < 2'800'000) tWTPDEN--;
-    }
-
-    void CalculateTR2W() {
-        tR2W = CEIL(RL_DBI + (tDQSCK_max / tCK_avg) + (BL / 2) - WL + tWPRE + FLOOR(tRPST) + 9.0) - (C.t6_tRTW * 3);
-
-        if (auto patch = FindTR2WPatch()) {
-            tR2W += patch->adjust;
-        }
-    }
-
-    void CalculatePdex2rw() {
-        double freq_mhz = C.marikoEmcMaxClock / 1000.0;
-
-        double pdex_local = (0.011 * freq_mhz) - 1.443;
-        pdex2rw = static_cast<u32>(ROUND(pdex_local));
-
-        if (pdex2rw < 22) pdex2rw = 22;
-        if (pdex2rw > 33) pdex2rw = 33;
-
-        if (auto patch = FindPdex2rwPatch()) {
-            pdex2rw += patch->adjust;
-        }
-    }
-
-    void CalculateCke2pden() {
-        cke2pden = (static_cast<double>((C.marikoEmcMaxClock / 1000.0) * 0.00875) - 0.65);
-
-        if (auto patch = FindCke2pdenPatch()) {
-            cke2pden += patch->adjust;
-        }
+        /* Fallback. */
+        rext = 0x1A;
    }

    void CalculateMrw2() {
@@ -93,11 +60,7 @@ namespace ams::ldr::oc::pcv::mariko {
    }

    void CalculateTimings() {
-        rext = GetRext();
-        CalculateTWTPDEN();
-        CalculateTR2W();
-        CalculatePdex2rw();
-        CalculateCke2pden();
+        GetRext();
        CalculateMrw2();
    }

--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/calculate_timings.hpp
@@ -16,7 +16,7 @@

 #pragma once

-namespace ams::ldr::oc::pcv::mariko {
+namespace ams::ldr::hoc::pcv::mariko {

    void CalculateTimings();

--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.cpp
@@ -17,7 +17,7 @@
 #include "../mtc_timing_value.hpp"
 #include "timing_tables.hpp"

-namespace ams::ldr::oc::pcv::mariko {
+namespace ams::ldr::hoc::pcv::mariko {

    const ReplacePatch g_rext_table[] = {
        {2'133'000, 0x1A}, {2'166'000, 0x19}, {2'200'000, 0x19},
@@ -36,78 +36,11 @@ namespace ams::ldr::oc::pcv::mariko {
    const u32 g_rext_table_size = sizeof(g_rext_table) / sizeof(g_rext_table[0]);

    const ReplacePatch *FindRext() {
-        for (u32 i = 0; i < g_rext_table_size; i++)
-            if (g_rext_table[i].freq == C.marikoEmcMaxClock)
+        for (u32 i = 0; i < g_rext_table_size; i++) {
+            if (g_rext_table[i].freq >= C.marikoEmcMaxClock) {
                return &g_rext_table[i];
-        return nullptr;
-    }
-
-    const AdjustPatch g_tr2w_patches[] = {
-        {2'500'000,  1},
-        {2'533'000,  1},
-        {2'566'000,  1},
-        {2'866'000, -1},
-        {3'100'000,  1},
-        {3'133'000,  1},
-    };
-
-    const u32 g_tr2w_table_size = sizeof(g_tr2w_patches) / sizeof(g_tr2w_patches[0]);
-
-    const AdjustPatch *FindTR2WPatch() {
-        for (u32 i = 0; i < g_tr2w_table_size; i++)
-            if (g_tr2w_patches[i].freq == C.marikoEmcMaxClock)
-                return &g_tr2w_patches[i];
-        return nullptr;
-    }
-
-    const AdjustPatch g_pdex2rw_patches[] = {
-        {2'166'000,  1},
-        {2'300'000,  1},
-        {2'333'000,  1},
-        {2'433'000,  1},
-        {2'533'000,  0},
-        {2'633'000, -1},
-        {2'666'000, -1},
-        {2'733'000, -1},
-        {2'766'000, -1},
-        {2'800'000, -1},
-        {2'833'000, -1},
-        {2'933'000, -1},
-        {3'066'000,  1},
-    };
-
-    const u32 g_pdex2rw_table_size = sizeof(g_pdex2rw_patches) / sizeof(g_pdex2rw_patches[0]);
-
-    const AdjustPatch *FindPdex2rwPatch() {
-        for (u32 i = 0; i < g_pdex2rw_table_size; i++)
-            if (g_pdex2rw_patches[i].freq == C.marikoEmcMaxClock)
-                return &g_pdex2rw_patches[i];
-        return nullptr;
-    }
-
-    const AdjustPatch g_cke2pden_patches[] = {
-        {2'133'000, 1},
-        {2'166'000, 1},
-        {2'266'000, 1},
-        {2'300'000, 1},
-        {2'366'000, 1},
-        {2'400'000, 1},
-        {2'500'000, 1},
-        {2'633'000, 1},
-        {2'733'000, 1},
-        {2'833'000, 1},
-        {2'866'000, 1},
-        {2'966'000, 1},
-        {3'066'000, 1},
-        {3'100'000, 1},
-    };
-
-    const u32 g_cke2pden_table_size = sizeof(g_cke2pden_patches) / sizeof(g_cke2pden_patches[0]);
-
-    const AdjustPatch *FindCke2pdenPatch() {
-        for (u32 i = 0; i < g_cke2pden_table_size; i++)
-            if (g_cke2pden_patches[i].freq == C.marikoEmcMaxClock)
-                return &g_cke2pden_patches[i];
+            }
+        }
        return nullptr;
    }

--- a/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mariko/timing_tables.hpp
@@ -17,32 +17,15 @@
 #pragma once
 #include "../mtc_timing_value.hpp"

-namespace ams::ldr::oc::pcv::mariko {
+namespace ams::ldr::hoc::pcv::mariko {

    struct ReplacePatch {
        u32 freq;
-        u32 correct;
+        u32 rext;
    };

    extern const ReplacePatch  g_rext_table[];
    extern const u32           g_rext_table_size;
    const        ReplacePatch *FindRext();

-    struct AdjustPatch {
-        u32 freq;
-        s32 adjust;
-    };
-
-    extern const AdjustPatch g_tr2w_patches[];
-    extern const u32         g_tr2w_table_size;
-    const AdjustPatch       *FindTR2WPatch();
-
-    extern const AdjustPatch g_pdex2rw_patches[];
-    extern const u32         g_pdex2rw_table_size;
-    const AdjustPatch       *FindPdex2rwPatch();
-
-    extern const AdjustPatch g_cke2pden_patches[];
-    extern const u32         g_cke2pden_table_size;
-    const AdjustPatch       *FindCke2pdenPatch();
-
 }
--- a/Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/mtc_timing_value.hpp
@@ -20,20 +20,20 @@

 #include "oc_common.hpp"

-namespace ams::ldr::oc {
-    #define MAX(A, B)   std::max(A, B)
-    #define MIN(A, B)   std::min(A, B)
-    #define CEIL(A)     std::ceil(A)
-    #define FLOOR(A)    std::floor(A)
-    #define ROUND(A)    std::lround(A)
+namespace ams::ldr::hoc {
+    #define MAX(A, B) std::max(A, B)
+    #define MIN(A, B) std::min(A, B)
+    #define CEIL(A)   std::ceil(A)
+    #define FLOOR(A)  std::floor(A)
+    #define ROUND(A)  std::lround(A)

    #define PACK_U32(high, low) ((static_cast<u32>(high) << 16) | (static_cast<u32>(low) & 0xFFFF))
    #define PACK_U32_NIBBLE_HIGH_BYTE_LOW(high, low) ((static_cast<u32>(high & 0xF) << 28) | (static_cast<u32>(low) & 0xFF))

    /* Primary timings. */
-    const std::array<u32,  8> tRCD_values  =  { 18, 17, 16, 15, 14, 13, 12, 11 };
-    const std::array<u32,  8> tRP_values   =  { 18, 17, 16, 15, 14, 13, 12, 11 };
-    const std::array<u32, 10> tRAS_values  =  { 42, 36, 34, 32, 30, 28, 26, 24, 22, 20 };
+    const std::array<u32,       8> tRCD_values    = { 18, 17, 16, 15, 14, 13, 12, 11 };
+    const std::array<u32,       8> tRP_values     = { 18, 17, 16, 15, 14, 13, 12, 11 };
+    const std::array<u32,      10> tRAS_values    = { 42, 36, 34, 32, 30, 28, 26, 24, 22, 20 };
    const std::array<double,    7>  tRRD_values   = { /*10.0,*/ 7.5, 6.0, 5.0, 4.0, 3.0, 2.0, 1.0 }; /* 10.0 is used for <2133mhz; do we care? 8gb uses 7.5 tRRD on >=1331. */
    const std::array<u32,      11>  tRFC_values   = { 140, 130, 120, 110, 100, 90, 80, 70, 60, 50, 40 };
    const std::array<u32,      10>  tWTR_values   = { 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 };
@@ -77,7 +77,49 @@ namespace ams::ldr::oc {

    /* TOOD: Fix erista */
    namespace pcv::erista {
+        const double tCK_avg = 1000'000.0 / C.eristaEmcMaxClock;

+        const u32 tRCD  = tRCD_values[C.t1_tRCD];
+        const u32 tRPpb = tRP_values[C.t2_tRP];
+        const u32 tRAS  = tRAS_values[C.t3_tRAS];
+        const double tRRD = tRRD_values[C.t4_tRRD];
+        const u32 tRFCpb = tRFC_values[C.t5_tRFC];
+        const u32 tWTR   = 10 - tWTR_values[C.t7_tWTR];
+
+        const u32 tRC = tRAS + tRPpb;
+        const u32 tRFCab = tRFCpb * 2;
+        const double tXSR = (double) (tRFCab + 7.5);
+        const u32 tFAW = static_cast<u32>(tRRD * 4.0);
+        const double tRPab = tRPpb + 3;
+
+        const u32 tR2P = 12;
+
+        const u32 tW2P = (CEIL(WL * 1.7303) * 2) - 5;
+        const u32 tW2R = CEIL(MAX(WL + (0.010322547033278747 * (C.eristaEmcMaxClock / 1000.0)), (WL * -0.2067922202979121) + FLOOR(((RL_DBI * -0.1331159971685554) + WL) * 3.654131957826108)) - (tWTR / tCK_avg));
+
+        const u32 wdv = WL;
+        const u32 wsv = WL - 2;
+        const u32 wev = 0xA + (WL - 14);
+
+        const double freq_mhz = C.eristaEmcMaxClock / 1000.0;
+
+        const u32 quse_width       = CEIL(((3.7165006256863955 - freq_mhz) + (-0.002446584377651142 * freq_mhz)) - FLOOR(freq_mhz / -0.9952024303111688));
+        const u32 quse             = CEIL(MIN(RL_DBI + (2.991255208275918 - (quse_width + (-0.00511180626826906 * freq_mhz))), freq_mhz * 0.021333773138874437));
+        const u32 ibdly            = 0x10000000 + FLOOR(MAX(RL_DBI - 1.9999956603408224, quse - 5.9999987787411175) + (-0.0011929079761504341 * freq_mhz));
+        const u32 obdlyHigh = 3 / FLOOR(MIN(static_cast<double>(2), tCK_avg * (WL - 7)));
+        const u32 obdlyLow = WL - MIN(static_cast<double>(WL), 12 - (CEIL(-0.0003991 * freq_mhz) * 2));
+        const u32 obdly = PACK_U32_NIBBLE_HIGH_BYTE_LOW(obdlyHigh, obdlyLow);
+        const u32 tCKE = CEIL(1.0795 * CEIL(0.0074472 * (C.eristaEmcMaxClock / 1000.0)));
+
+        const double tMMRI = tRCD + (tCK_avg * 3);
+        const double pdex2mrr = tMMRI + 10;
+        const u32 tWTPDEN = tW2P + 1 + CEIL(tDQSS_max / tCK_avg) + CEIL(tDQS2DQ_max / tCK_avg) + 6;
+        const u32 tR2W = CEIL(RL_DBI + (tDQSCK_max / tCK_avg) + (BL / 2) - WL + tWPRE + FLOOR(tRPST) + 9.0) - (C.t6_tRTW * 3);
+
+        const double pdex_local = (0.011 * freq_mhz) - 1.443;
+        const u32 pdex2rw = static_cast<u32>(ROUND(pdex_local)) < 22 ? 22 : (static_cast<u32>(ROUND(pdex_local)) > 33 ? 33 : static_cast<u32>(ROUND(pdex_local)));
+
+        const double cke2pden = (static_cast<double>((C.eristaEmcMaxClock / 1000.0) * 0.00875) - 0.65);
    }

    namespace pcv::mariko {
@@ -90,6 +132,8 @@ namespace ams::ldr::oc {
        const double tRRD = tRRD_values[C.t4_tRRD];
        const u32 tRFCpb  = tRFC_values[C.t5_tRFC];
        const u32 tWTR    = 10 - tWTR_values[C.t7_tWTR];
+        const s32 finetRTW = C.fineTune_t6_tRTW;
+        const s32 finetWTR = C.fineTune_t7_tWTR;

        const u32 tRC      = tRAS + tRPpb;
        const u32 tRFCab   = tRFCpb * 2;
@@ -97,43 +141,41 @@ namespace ams::ldr::oc {
        const u32 tFAW     = static_cast<u32>(tRRD * 4.0);
        const double tRPab = tRPpb + 3;

-        const u32 tR2P   = 12 + ((RL_DBI - 32) / 2);
-        inline u32 tR2W;
-        const u32 tRTM   = RL + 9 + (tDQSCK_max / tCK_avg) + FLOOR(tRPST) + CEIL(10 / tCK_avg); // Fix?
-        const u32 tRATM  = tRTM + CEIL(10 / tCK_avg) - 12; // Fix?
+        const u32 tR2P   = CEIL((RL_DBI * 0.426) - 2.0);
+        const u32 tR2W = FLOOR(FLOOR((5.0 / tCK_avg) + ((FLOOR(48.0 / WL) - 0.478) * 3.0)) / 1.501) + RL_DBI - (C.t6_tRTW * 3) + finetRTW;
+        const u32 tRTM   = FLOOR((10.0 + RL_DBI) + (3.502 / tCK_avg)) + FLOOR(7.489 / tCK_avg);
+        const u32 tRATM  = CEIL((tRTM - 10.0) + (RL_DBI * 0.426));
        inline u32 rext;

-        const u32 rdv              = FLOOR(17.02046755653219 + (RL_DBI + (ramFreqMhz * 0.00510056573299173)));
-        const u32 qpop             = rdv - 14;
-        const u32 quse_width       = CEIL(((3.7165006256863955 - ramFreqMhz) + (-0.002446584377651142 * ramFreqMhz)) - FLOOR(ramFreqMhz / -0.9952024303111688));
-        const u32 quse             = CEIL(MIN(RL_DBI + (2.991255208275918 - (quse_width + (-0.00511180626826906 * ramFreqMhz))), ramFreqMhz * 0.021333773138874437));
-        const u32 einput_duration  = CEIL(quse_width + (ramFreqMhz * 0.01) + 4);
-        const u32 einput           = 5 + qpop - einput_duration;
-        const u32 ibdly            = 0x10000000 + FLOOR(MAX(RL_DBI - 1.9999956603408224, quse - 5.9999987787411175) + (-0.0011929079761504341 * ramFreqMhz));
-        const u32 qrst_duration    = FLOOR((ramFreqMhz * 0.001477125119082522) + 4.272302254983803);
-        const u32 qrstLow          = MAX(static_cast<s32>(einput - qrst_duration - 2), static_cast<s32>(0));
-        const u32 qrst             = PACK_U32(qrst_duration, qrstLow);
-        const u32 qsafe            = (einput_duration + 3) + MAX(MIN(qrstLow * rdv, qrst_duration + qrst_duration), einput);
-
-        const u32 tW2P  = (CEIL(WL * 1.7303) * 2) - 5;
-        inline u32 tWTPDEN;
-        const u32 tW2R  = CEIL(MAX(WL + (0.010322547033278747 * ramFreqMhz), (WL * -0.2067922202979121) + FLOOR(((RL_DBI * -0.1331159971685554) + WL) * 3.654131957826108)) - (tWTR / tCK_avg));
-        const u32 tWTM  = WL + (BL / 2) + 1 + CEIL(7.5 / tCK_avg);
-        const u32 tWATM = tWTM + CEIL(tWR / tCK_avg);
+        const u32 rdv             = RL_DBI + FLOOR((5.105 / tCK_avg) + 17.017);
+        const u32 qpop            = rdv - 14;
+        const u32 quse_width      = CEIL(((4.897 / tCK_avg) - FLOOR(2.538 / tCK_avg)) + 3.782);
+        const u32 quse            = FLOOR(RL_DBI + ((5.082 / tCK_avg) + FLOOR(2.560 / tCK_avg))) - CEIL(4.820 / tCK_avg);
+        const u32 einput_duration = FLOOR(9.936 / tCK_avg) + 5.0 + quse_width;
+        const u32 einput          = quse - CEIL(9.928 / tCK_avg);
+        const u32 qrst_duration   = FLOOR(8.399 - tCK_avg);
+        const u32 qrstLow         = MAX(static_cast<s32>(einput - qrst_duration - 2), static_cast<s32>(0));
+        const u32 qrst            = PACK_U32(qrst_duration, qrstLow);
+        const u32 ibdly           = PACK_U32_NIBBLE_HIGH_BYTE_LOW(1, quse - qrst_duration - 2.0);
+        const u32 qsafe           = (einput_duration + 3) + MAX(MIN(qrstLow * rdv, qrst_duration + qrst_duration), einput);
+        const u32 tW2P            = (CEIL(WL * 1.7303) * 2) - 5;
+        const u32 tWTPDEN         = CEIL(((1.803 / tCK_avg) + MAX(RL_DBI + (2.694 / tCK_avg), static_cast<double>(tW2P))) + (BL / 2));
+        const u32 tW2R            = FLOOR(MAX((5.020 / tCK_avg) + 1.130, WL - MAX(-CEIL(0.258 * (WL - RL_DBI)), 1.964)) * 1.964) + WL - CEIL(tWTR / tCK_avg) + finetWTR;
+        const u32 tWTM            = CEIL(WL + ((7.570 / tCK_avg) + 8.753));
+        const u32 tWATM           = (tWTM + (FLOOR(WL / 0.816) * 2.0)) - 4.0;

        const u32 wdv = WL;
        const u32 wsv = WL - 2;
        const u32 wev = 0xA + (WL - 14);

        const u32 obdlyHigh = 3 / FLOOR(MIN(static_cast<double>(2), tCK_avg * (WL - 7)));
-        const u32 obdlyLow = WL - MIN(static_cast<double>(WL), 12 - (CEIL(-0.0003991 * ramFreqMhz) * 2));
+        const u32 obdlyLow = MAX(WL - FLOOR((126.0 / CEIL(tCK_avg + 8.601))), 0.0);

        const u32 obdly = PACK_U32_NIBBLE_HIGH_BYTE_LOW(obdlyHigh, obdlyLow);

-        inline u32 pdex2rw;
-        inline u32 cke2pden;
+        const u32 pdex2rw = CEIL((CEIL(12.335 - tCK_avg) + (7.430 / tCK_avg) - CEIL(tCK_avg * 11.361)));

-        const u32 tCKE = CEIL(1.0795 * CEIL(0.0074472 * ramFreqMhz));
+        const u32 tCLKSTOP = FLOOR(MIN(8.488 / tCK_avg, 23.0)) + 8.0;

        const double tMMRI    = tRCD + (tCK_avg * 3);
        const double pdex2mrr = tMMRI + 10; /* Do this properly? */
--- a/Source/Atmosphere/stratosphere/loader/source/oc/oc_common.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/oc_common.hpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -52,7 +52,7 @@ namespace ams::ldr {
    R_DEFINE_ERROR_RESULT(SafetyCheckFailure,       1015);
 }

-namespace ams::ldr::oc {
+namespace ams::ldr::hoc {
    template<typename Pointer>
    struct PatcherEntry {
        using patternFn = bool(*)(Pointer* ptr);
--- a/Source/Atmosphere/stratosphere/loader/source/oc/oc_loader.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/oc_loader.hpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/Atmosphere/stratosphere/loader/source/oc/oc_test.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/oc_test.cpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -65,7 +65,7 @@ void saveExec(const char* file_loc, const void* buf, size_t size) {
 }

 Result Test_PcvDvfsTable() {
-    using namespace ams::ldr::oc::pcv;
+    using namespace ams::ldr::hoc::pcv;

    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&mariko::CpuCvbTableDefault)) == 18);
    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&erista::CpuCvbTableDefault)) == 16);
@@ -76,19 +76,19 @@ Result Test_PcvDvfsTable() {
    cvb_entry_t last_mariko_cpu_cvb_entry_default = { 1963500, { 1675751, -38635, 27 }, { 1120000 } };
    assert(memcmp(GetDvfsTableLastEntry((cvb_entry_t *)(&mariko::CpuCvbTableDefault)), (void *)&last_mariko_cpu_cvb_entry_default, sizeof(last_mariko_cpu_cvb_entry_default)) == 0);
    assert(GetDvfsTableLastEntry((cvb_entry_t *)(&erista::GpuCvbTableDefault))->freq == 921600);
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.marikoCpuDvfsTableSLT)) == 25);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.marikoCpuDvfsTableSLT)) == 25);

    // Customized table default
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.eristaCpuDvfsTable)) == 19);
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.marikoCpuDvfsTable)) == 21);
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.marikoCpuDvfsTableSLT)) == 22);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.eristaCpuDvfsTable)) == 19);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.marikoCpuDvfsTable)) == 21);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.marikoCpuDvfsTableSLT)) == 22);

-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.eristaGpuDvfsTable)) == 12);
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.marikoGpuDvfsTable)) == 17);
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.marikoGpuDvfsTableSLT)) == 17);
-    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::oc::C.marikoGpuDvfsTableHiOPT)) == 17);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.eristaGpuDvfsTable)) == 12);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.marikoGpuDvfsTable)) == 17);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.marikoGpuDvfsTableSLT)) == 17);
+    assert(GetDvfsTableEntryCount((cvb_entry_t *)(&ams::ldr::hoc::C.marikoGpuDvfsTableHiOPT)) == 17);

-    constexpr size_t limit = ams::ldr::oc::pcv::DvfsTableEntryLimit;
+    constexpr size_t limit = ams::ldr::hoc::pcv::DvfsTableEntryLimit;
    cvb_entry_t customized_table[limit] = {};
    for (size_t i = 0; i < limit; i++) {
        assert(GetDvfsTableEntryCount(customized_table) == i);
@@ -156,14 +156,14 @@ int main(int argc, char** argv) {
    size_t exec_path_patched_len = exec_path_len + std::max(strlen(mariko_ext), strlen(erista_ext)) + 1;

    if (exe_opt == EXE_PCV) {
-        ams::ldr::oc::pcv::SafetyCheck();
+        ams::ldr::hoc::pcv::SafetyCheck();

        {
            void* erista_buf = malloc(file_size);
            std::memcpy(erista_buf, file_buffer, file_size);

            printf("Patching %s for Erista...\n", pcv_opt);
-            ams::ldr::oc::pcv::erista::Patch(reinterpret_cast<uintptr_t>(erista_buf), file_size);
+            ams::ldr::hoc::pcv::erista::Patch(reinterpret_cast<uintptr_t>(erista_buf), file_size);
            if (save_patched) {
                char* exec_path_erista = reinterpret_cast<char *>(malloc(exec_path_patched_len));
                strncpy(exec_path_erista, exec_path, exec_path_patched_len);
@@ -179,7 +179,7 @@ int main(int argc, char** argv) {
            std::memcpy(mariko_buf, file_buffer, file_size);

            printf("Patching %s for Mariko...\n", pcv_opt);
-            ams::ldr::oc::pcv::mariko::Patch(reinterpret_cast<uintptr_t>(mariko_buf), file_size);
+            ams::ldr::hoc::pcv::mariko::Patch(reinterpret_cast<uintptr_t>(mariko_buf), file_size);
            if (save_patched) {
                char* exec_path_mariko = reinterpret_cast<char *>(malloc(exec_path_patched_len));
                strncpy(exec_path_mariko, exec_path, exec_path_patched_len);
@@ -196,7 +196,7 @@ int main(int argc, char** argv) {
        std::memcpy(mariko_buf, file_buffer, file_size);

        printf("Patching %s (Mariko Only)...\n", ptm_opt);
-        ams::ldr::oc::ptm::Patch(reinterpret_cast<uintptr_t>(mariko_buf), file_size);
+        ams::ldr::hoc::ptm::Patch(reinterpret_cast<uintptr_t>(mariko_buf), file_size);
        if (save_patched) {
            char* exec_path_mariko = reinterpret_cast<char *>(malloc(exec_path_patched_len));
            strncpy(exec_path_mariko, exec_path, exec_path_patched_len);
--- a/Source/Atmosphere/stratosphere/loader/source/oc/oc_test.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/oc_test.hpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2023 hanai3Bi
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,7 @@

 #include "pcv.hpp"

-namespace ams::ldr::oc::pcv {
+namespace ams::ldr::hoc::pcv {

 Result MemFreqPllmLimit(u32* ptr) {
    clk_pll_param* entry = reinterpret_cast<clk_pll_param *>(ptr);
@@ -115,7 +115,6 @@ void SafetyCheck() {
        eristaGpuDvfsMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(C.eristaGpuDvfsTableSLT)->freq);
        break;
    case 2:
-    case 3:
        eristaGpuDvfsMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(C.eristaGpuDvfsTableHiOPT)->freq);
        break;
    default:
@@ -132,7 +131,6 @@ void SafetyCheck() {
            marikoGpuDvfsMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(C.marikoGpuDvfsTableSLT)->freq);
            break;
        case 2:
-        case 3:
            marikoGpuDvfsMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(C.marikoGpuDvfsTableHiOPT)->freq);
            break;
        default:
@@ -143,12 +141,12 @@ void SafetyCheck() {
    sValidator validators[] = {
        { C.eristaCpuBoostClock, 1020'000, 2295'000, true },
        { C.marikoCpuBoostClock, 1020'000, 2703'000, true },
-        { C.commonEmcMemVolt,    1100'000, 1350'000 }, // Official burst vmax for the RAMs is 1500mV
-        { C.eristaCpuMaxVolt,        1100,     1257 },
-        { C.eristaEmcMaxClock,   1600'000, 2600'200 },
-        { C.marikoCpuMaxVolt,        1100,     1235 },
+        { C.commonEmcMemVolt,     912'500, 1350'000 }, // Official burst vmax for the RAMs is 1500mV
+        { C.eristaCpuMaxVolt,        1000,     1257 },
+        { C.eristaEmcMaxClock,   1600'000, 2600'000 },
+        { C.marikoCpuMaxVolt,        1000,     1235 },
        { C.marikoEmcMaxClock,   1600'000, 3500'000 },
-        { C.marikoEmcVddqVolt,    550'000,  700'000 },
+        { C.marikoEmcVddqVolt,    250'000,  700'000 },
        { eristaCpuDvfsMaxFreq,  1785'000, 2295'000 },
        { marikoCpuDvfsMaxFreq,  1785'000, 2703'000 },
        { eristaGpuDvfsMaxFreq,   768'000, 1152'000 },
--- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2023 hanai3Bi
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -23,7 +23,7 @@
 #include "../oc_common.hpp"
 #include "pcv_common.hpp"

-namespace ams::ldr::oc::pcv {
+namespace ams::ldr::hoc::pcv {

    namespace mariko {
        constexpr cvb_entry_t CpuCvbTableDefault[] = {
@@ -216,9 +216,8 @@ namespace ams::ldr::oc::pcv {
        constexpr u32 GpuClkPllLimit = 921'600'000;
        constexpr u32 GpuVminOfficial = 810;

-        static const u32 gpuVoltDvfsPattern[] = { 1150, 1000, 100, 1000, 10, };
-        static const u32 gpuVoltDvfsOffsets[] = {    1,    2,   3,    4,  5, };
-        static_assert(sizeof(gpuVoltDvfsPattern) == sizeof(gpuVoltDvfsOffsets), "Invalid gpuVoltDvfsPattern");
+        static const u32 gpuVoltDvfsPattern[] = { 810, 1150, 1000, 100, 1000, 10, };
+        static_assert(sizeof(gpuVoltDvfsPattern) == (sizeof(u32) * 6), "Invalid gpuVoltDvfsPattern");

        static const u32 gpuVoltThermalPattern[] = { 950, 1132, 0, 810, 1132, 15000, 810, 1132, 30000, 810, 1132, 50000, 810, 1132, 70000, 810, 1132, 105000 };
        static_assert(sizeof(gpuVoltThermalPattern) == 0x48, "invalid gpuVoltageThermalPattern size");
@@ -309,8 +308,8 @@ namespace ams::ldr::oc::pcv {
                    customize_table = const_cast<cvb_entry_t *>(C.marikoCpuDvfsTable1581Tbreak);
                    break;
                }
-                case HELIOS_TABLE: {
-                    customize_table = const_cast<cvb_entry_t *>(C.marikoCpuDvfsTableHelios);
+                case EXTREME_TABLE: {
+                    customize_table = const_cast<cvb_entry_t *>(C.marikoCpuDvfsTableExtreme);
                    break;
                }
                case DEFAULT_TABLE:
--- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_common.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_common.hpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -18,7 +18,7 @@

 #pragma once

- namespace ams::ldr::oc::pcv {
+ namespace ams::ldr::hoc::pcv {

 typedef struct cvb_coefficients {
     s32 c0 = 0;
--- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp
@@ -3,7 +3,7 @@
 *
 * Copyright (c) 2023 hanai3Bi
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -21,7 +21,7 @@
 #include "pcv.hpp"
 #include "../mtc_timing_value.hpp"

-namespace ams::ldr::oc::pcv::erista {
+namespace ams::ldr::hoc::pcv::erista {

    Result CpuVoltDvfs(u32 *ptr) {
        if (MatchesPattern(ptr, cpuVoltDvfsPattern, cpuVoltDvfsOffsets)) {
@@ -66,10 +66,10 @@ namespace ams::ldr::oc::pcv::erista {

    Result CpuVoltDfll(u32* ptr) {
        cvb_cpu_dfll_data *entry = reinterpret_cast<cvb_cpu_dfll_data *>(ptr);
-        R_UNLESS(entry->tune0_low == 0x0000FFCF,   ldr::ResultInvalidCpuVoltDfllEntry());
-        R_UNLESS(entry->tune0_high == 0x00000000,    ldr::ResultInvalidCpuVoltDfllEntry());
-        R_UNLESS(entry->tune1_low == 0x012207FF,   ldr::ResultInvalidCpuVoltDfllEntry());
-        R_UNLESS(entry->tune1_high == 0x03FFF7FF,    ldr::ResultInvalidCpuVoltDfllEntry());
+        R_UNLESS(entry->tune0_low == 0xFFEAD0FF,   ldr::ResultInvalidCpuVoltDfllEntry());
+        R_UNLESS(entry->tune0_high == 0x0,   ldr::ResultInvalidCpuVoltDfllEntry());
+        R_UNLESS(entry->tune1_low == 0x0,   ldr::ResultInvalidCpuVoltDfllEntry());
+        R_UNLESS(entry->tune1_high == 0x0,    ldr::ResultInvalidCpuVoltDfllEntry());

        if( !C.eristaCpuUV) {
            R_SKIP();
@@ -103,14 +103,15 @@ namespace ams::ldr::oc::pcv::erista {
    }

    Result GpuVoltDVFS(u32 *ptr) {
-        if (MatchesPattern(ptr, gpuVoltDvfsPattern, gpuVoltDvfsOffsets)) {
-            if (C.eristaGpuVmin) {
-                PATCH_OFFSET(ptr, C.eristaGpuVmin);
-            }
-            R_SUCCEED();
-        }
+        u32 result = std::memcmp(ptr, gpuVoltDvfsPattern, sizeof(gpuVoltDvfsPattern));

-        R_THROW(ldr::ResultInvalidGpuDvfs());
+        if (result)
+            R_THROW(ldr::ResultInvalidGpuDvfs());
+
+        if (C.eristaGpuVmin)
+            PATCH_OFFSET(ptr, C.eristaGpuVmin);
+
+        R_SUCCEED();
    }

    Result GpuVoltThermals(u32 *ptr) {
@@ -492,206 +493,154 @@ namespace ams::ldr::oc::pcv::erista {

    /* These timings are slightly off from eos, I am not sure why but I am going to figure it out at some point. */
    void MemMtcTableAutoAdjust(EristaMtcTable *table) {
-        (void) table;
-
-     //   using namespace pcv::erista;
-     //
-     /*   #define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) // note: add backslashes to make the macro definition work
-            TABLE->burst_regs.PARAM = VALUE; \
-           TABLE->shadow_regs_ca_train.PARAM = VALUE; \
-        TABLE->shadow_regs_quse_train.PARAM = VALUE; \
+        #define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) \
+            TABLE->burst_regs.PARAM = VALUE;             \
+            TABLE->shadow_regs_ca_train.PARAM   = VALUE; \
            TABLE->shadow_regs_rdwr_train.PARAM = VALUE;
-     */
-      // #define GET_CYCLE(PARAM) ((u32)((double)(PARAM) / (1000000.0 / 1600000.0)))
-     //
-     //   /* This condition is insane but it's done in eos. */
-     //   /* Need to clean up at some point. */
-     //   u32 rext;
-     //   u32 wext;
-     //   if (C.eristaEmcMaxClock < 3200001) {
-     //       if (C.eristaEmcMaxClock < 2133001) {
-     //           rext = 26;
-     //           wext = 22;
-     //       } else {
-     //           rext = 28;
-     //           wext = 22;
-     //
-     //           if (2400000 < C.eristaEmcMaxClock) {
-     //               wext = 25;
-     //           }
-     //       }
-     //   } else {
-     //       rext = 30;
-     //       wext = 25;
-     //   }
-     //
-     //   u32 refresh_raw = 0xFFFF;
-     //   u32 trefbw = 0;
-     //
-     //   if (C.t8_tREFI != 6) {
-     //       refresh_raw = static_cast<u32>(std::floor(static_cast<double>(tREFpb_values[C.t8_tREFI]) / tCK_avg)) - 0x40;
-     //       refresh_raw = MIN(refresh_raw, static_cast<u32>(0xFFFF));
-     //   }
-     //
-     //   trefbw = refresh_raw + 0x40;
-     //   trefbw = MIN(trefbw, static_cast<u32>(0x3FFF));
-     //
-     //   /* Primary timings. */
-     //   WRITE_PARAM_ALL_REG(table, emc_rd_rcd, GET_CYCLE(tRCD));
-     //   WRITE_PARAM_ALL_REG(table, emc_wr_rcd, GET_CYCLE(tRCD));
-     //   WRITE_PARAM_ALL_REG(table, emc_ras,    GET_CYCLE(tRAS));
-     //   WRITE_PARAM_ALL_REG(table, emc_rp,     GET_CYCLE(tRPpb));
-     //
-     //   /* Secondary timings. */
-     //   WRITE_PARAM_ALL_REG(table, emc_rrd,     GET_CYCLE(tRRD));
-     //   WRITE_PARAM_ALL_REG(table, emc_rfc,     GET_CYCLE(tRFCab));
-     //   WRITE_PARAM_ALL_REG(table, emc_rfcpb,   GET_CYCLE(tRFCpb));
-     //   WRITE_PARAM_ALL_REG(table, emc_r2w,     tR2W);
-     //   WRITE_PARAM_ALL_REG(table, emc_w2r,     tW2R);
-     //   WRITE_PARAM_ALL_REG(table, emc_r2p,   (u32)  0xC);
-     //   WRITE_PARAM_ALL_REG(table, emc_w2p,     (u32) 0x2D);
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_rext, rext);
-     //   WRITE_PARAM_ALL_REG(table, emc_wext, wext);
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_trpab,  GET_CYCLE(tRPab));
-     //   WRITE_PARAM_ALL_REG(table, emc_tfaw,   GET_CYCLE(tFAW));
-     //   WRITE_PARAM_ALL_REG(table, emc_rc,     GET_CYCLE(tRC));
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_tckesr,   GET_CYCLE(tSR));
-     //   WRITE_PARAM_ALL_REG(table, emc_tcke,     GET_CYCLE(tXP) + 1);
-     //   WRITE_PARAM_ALL_REG(table, emc_tpd,      GET_CYCLE(tXP));
-     //   WRITE_PARAM_ALL_REG(table, emc_tclkstop, GET_CYCLE(tXP) + 8);
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_txsr,    MIN(GET_CYCLE(tXSR), (u32) 1022));
-     //   WRITE_PARAM_ALL_REG(table, emc_txsrdll, MIN(GET_CYCLE(tXSR), (u32) 1022));
-     //
-     //   const u32 dyn_self_ref_control = (((u32)(7605.0 / tCK_avg)) + 260U) | (table->burst_regs.emc_dyn_self_ref_control & 0xffff0000U);
-     //   WRITE_PARAM_ALL_REG(table, emc_dyn_self_ref_control, dyn_self_ref_control);
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_rw2pden, tRW2PDEN);
-     //   WRITE_PARAM_ALL_REG(table, emc_pdex2wr, GET_CYCLE(10.0));
-     //   WRITE_PARAM_ALL_REG(table, emc_pdex2rd, GET_CYCLE(10.0));
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_pchg2pden, GET_CYCLE(1.75));
-     //   WRITE_PARAM_ALL_REG(table, emc_ar2pden,   GET_CYCLE(1.75));
-     //   WRITE_PARAM_ALL_REG(table, emc_pdex2cke,  GET_CYCLE(1.75));
-     //   WRITE_PARAM_ALL_REG(table, emc_act2pden,  GET_CYCLE(14.0));
-     //   WRITE_PARAM_ALL_REG(table, emc_cke2pden,  GET_CYCLE(5.0));
-     //   WRITE_PARAM_ALL_REG(table, emc_pdex2mrr,  GET_CYCLE(pdex2mrr));
-     //
-     //   WRITE_PARAM_ALL_REG(table, emc_refresh,                    refresh_raw);
-     //   WRITE_PARAM_ALL_REG(table, emc_pre_refresh_req_cnt, (u32) (refresh_raw / 4));
-     //   WRITE_PARAM_ALL_REG(table, emc_trefbw,                     trefbw);
-     //
-     //   const u32 mc_tRCD = (int)((double)(GET_CYCLE(tRCD) >> 2) - 2.0);
-     //   const u32 mc_tRPpb = (int)(((double)(GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0);
-     //   const u32 mc_tRC = (uint)((double)(GET_CYCLE(tRC) >> 2) - 1.0);
-     //   const u32 mc_tR2W = (uint)(((double)((uint)tR2W >> 2) - 1.0) + 2.0);
-     //   const u32 mc_tW2R = (uint)(((double)(tW2R >> 2) - 1.0) + 2.0);
-     //   const u32 mc_tRAS = MIN(GET_CYCLE(tRAS), (u32) 0x7F);
-     //   const u32 mc_tRRD = MIN(GET_CYCLE(tRRD), (u32) 31);
-     //
-     //   table->burst_mc_regs.mc_emem_arb_cfg = (int)(((double) C.eristaEmcMaxClock / 33300.0) * 0.25);
-     //   table->burst_mc_regs.mc_emem_arb_timing_ras = (int) ((double) (mc_tRAS >> 2) - 2.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_rcd = (int) ((double) (GET_CYCLE(tRCD) >> 2) - 2.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_rp = (int) (((double) (GET_CYCLE(tRPpb) >> 2) - 1.0) + 2.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_rc = (int) ((double) (GET_CYCLE(tRC) >> 2) - 1.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_faw = (int) ((double)(GET_CYCLE(tFAW) >> 2) - 1.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_rrd = (int)((double)(mc_tRRD >> 2) - 1.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_rap2pre = 3;
-     //   table->burst_mc_regs.mc_emem_arb_timing_wap2pre = 11;
-     //   table->burst_mc_regs.mc_emem_arb_timing_r2w = (uint)(((double)((uint)tR2W >> 2) - 1.0) + 2.0);
-     //   table->burst_mc_regs.mc_emem_arb_timing_w2r = (uint)(((double)(tW2R >> 2) - 1.0) + 2.0);
-     //
-     //   u32 mc_r2r = table->burst_mc_regs.mc_emem_arb_timing_r2r;
-     //   if (mc_r2r > 1) {
-     //       mc_r2r = (uint)(((double)(long)((double)rext * 0.25) - 1.0) + 2.0);
-     //       table->burst_mc_regs.mc_emem_arb_timing_r2r = mc_r2r;
-     //   }
-     //
-     //   u32 mc_w2w = table->burst_mc_regs.mc_emem_arb_timing_w2w;
-     //   if (mc_w2w > 1) {
-     //       mc_w2w = (uint)(((double)(long)((double)wext / 4.0) - 1.0) + 2.0);
-     //       table->burst_mc_regs.mc_emem_arb_timing_w2w = mc_w2w;
-     //   }
-     //
-     //   table->burst_mc_regs.mc_emem_arb_da_turns = ((mc_tW2R >> 1) << 0x18) | ((mc_tR2W >> 1) << 0x10) | ((mc_r2r >> 1) << 8) | ((mc_w2w >> 1));
-     //   table->burst_mc_regs.mc_emem_arb_da_covers = (((uint)(mc_tRCD + 3 + mc_tRPpb) >> 1 & 0xff) << 8) | (((uint)(mc_tRCD + 11 + mc_tRPpb) >> 1 & 0xff) << 0x10) | ((mc_tRC >> 1) & 0xff);
-     //   table->burst_mc_regs.mc_emem_arb_misc0 = (table->burst_mc_regs.mc_emem_arb_misc0 & 0xffe08000U) | ((mc_tRC + 1) & 0xff);
-     //   table->la_scale_regs.mc_mll_mpcorer_ptsa_rate =         MIN((u32)((C.eristaEmcMaxClock / 1600000) * 0xd0U), (u32)0x115);
-     //   table->la_scale_regs.mc_ftop_ptsa_rate =         MIN((u32)((C.eristaEmcMaxClock / 1600000) * 0x18U), (u32)0x1f);
-     //   table->la_scale_regs.mc_ptsa_grant_decrement =         MIN((u32)((C.eristaEmcMaxClock / 1600000) * 0x1203U), (u32)0x17ff);
-     //
-     //   u32 mc_latency_allowance = 0;
-     //   if (C.eristaEmcMaxClock / 1000 != 0) {
-     //       mc_latency_allowance = 204800 / (C.eristaEmcMaxClock / 1000);
-     //   }
-     //
-     //   const u32 mc_latency_allowance2 = mc_latency_allowance & 0xFF;
-     //   const u32 mc_latency_allowance3 = (mc_latency_allowance & 0xFF) << 0x10;
-     //   table->la_scale_regs.mc_latency_allowance_xusb_0 = (table->la_scale_regs.mc_latency_allowance_xusb_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_sdmmc_0 = (table->la_scale_regs.mc_latency_allowance_sdmmc_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_xusb_1 = (table->la_scale_regs.mc_latency_allowance_xusb_1 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_tsec_0 = (table->la_scale_regs.mc_latency_allowance_tsec_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_sdmmca_0 = (table->la_scale_regs.mc_latency_allowance_sdmmca_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_sdmmcaa_0 = (table->la_scale_regs.mc_latency_allowance_sdmmcaa_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_sdmmcab_0 = (table->la_scale_regs.mc_latency_allowance_sdmmcab_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_ppcs_1 = (table->la_scale_regs.mc_latency_allowance_ppcs_1 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_mpcore_0 = (table->la_scale_regs.mc_latency_allowance_mpcore_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_avpc_0 = (table->la_scale_regs.mc_latency_allowance_avpc_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //
-     //   u32 mc_latency_allowance_hc_0 = 0;
-     //   if (C.eristaEmcMaxClock / 1000 != 0) {
-     //       mc_latency_allowance_hc_0 = 35200 / (C.eristaEmcMaxClock / 1000);
-     //   }
-     //
-     //   table->la_scale_regs.mc_latency_allowance_nvdec_0 = (table->la_scale_regs.mc_latency_allowance_nvdec_0 & 0xff00ffffU) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_hc_0 = (table->la_scale_regs.mc_latency_allowance_hc_0 & 0xffffff00U) | mc_latency_allowance_hc_0;
-     //
-     //   table->la_scale_regs.mc_latency_allowance_isp2_1 = (table->la_scale_regs.mc_latency_allowance_isp2_1 & 0xff00ff00U) | mc_latency_allowance3 | mc_latency_allowance2;
-     //   table->la_scale_regs.mc_latency_allowance_hc_1 = (table->la_scale_regs.mc_latency_allowance_hc_1 & 0xffffff00U) | mc_latency_allowance2;
-     //
-     //   u32 mc_latency_allowance_gpu_0 = 0;
-     //   if (C.eristaEmcMaxClock / 1000 != 0) {
-     //       mc_latency_allowance_gpu_0 = 40000 / (C.eristaEmcMaxClock / 1000);
-     //   }
-     //
-     //   table->la_scale_regs.mc_latency_allowance_gpu_0 = ((mc_latency_allowance_gpu_0 | table->la_scale_regs.mc_latency_allowance_gpu_0) & 0xff00ff00U) | mc_latency_allowance3;
-     //
-     //   u32 mc_latency_allowance_gpu2_0 = 0;
-     //   if (C.eristaEmcMaxClock / 1000 != 0) {
-     //   mc_latency_allowance_gpu2_0 = 40000 / (C.eristaEmcMaxClock / 1000);
-     //   }
-     //
-     //   table->la_scale_regs.mc_latency_allowance_gpu2_0 = ((mc_latency_allowance_gpu2_0 | table->la_scale_regs.mc_latency_allowance_gpu2_0) & 0xff00ff00U) | mc_latency_allowance3;
-     //
-     //   u32 mc_latency_allowance_nvenc_0 = 0;
-     //   if (C.eristaEmcMaxClock / 1000 != 0) {
-     //       mc_latency_allowance_nvenc_0 = 38400 / (C.eristaEmcMaxClock / 1000);
-     //   }
-     //
-     //   table->la_scale_regs.mc_latency_allowance_nvenc_0 = ((mc_latency_allowance_nvenc_0 | table->la_scale_regs.mc_latency_allowance_nvenc_0) & 0xff00ff00U) | mc_latency_allowance3;
-     //
-     //   u32 mc_latency_allowance_vic_0 = 0;
-     //   if (C.eristaEmcMaxClock / 1000 != 0) {
-     //       mc_latency_allowance_vic_0 = 0xb540 / (C.eristaEmcMaxClock / 1000);
-     //   }
-     //
-     //   table->la_scale_regs.mc_latency_allowance_vic_0 = ((mc_latency_allowance_vic_0 | table->la_scale_regs.mc_latency_allowance_vic_0) & 0xff00ff00U) | mc_latency_allowance3;
-     //   table->la_scale_regs.mc_latency_allowance_vi2_0 = (table->la_scale_regs.mc_latency_allowance_vi2_0 & 0xffffff00U) | mc_latency_allowance2;
-     //
-     //   table->burst_mc_regs.mc_emem_arb_timing_rfcpb = GET_CYCLE(tRFCpb) >> 2;
-     //
-     //   if (C.hpMode) {
-     //       WRITE_PARAM_ALL_REG(table, emc_cfg, 0x13200000);
-     //   }
-     //
-     //   table->dram_timings.t_rp = tRFCpb;
-     //   table->dram_timings.t_rfc = tRFCab;
-     //   table->emc_cfg_2 = 0x11083d;
-     //   #undef GET_CYCLE
-    }
+
+        #define GET_CYCLE_CEIL(PARAM) u32(CEIL(double(PARAM) / tCK_avg))
+        /* Ram power down       */
+        /* B31: DRAM_CLKSTOP_PD */
+        /* B30: DRAM_CLKSTOP_SR */
+        /* B29: DRAM_ACPD       */
+        if (C.hpMode) {
+            WRITE_PARAM_ALL_REG(table, emc_cfg, 0x13200000);
+        } else {
+            WRITE_PARAM_ALL_REG(table, emc_cfg, 0xF3200000);
+        }
+
+        u32 refresh_raw = 0xFFFF;
+        if (C.t8_tREFI != 6) {
+            refresh_raw = CEIL(tREFpb_values[C.t8_tREFI] / tCK_avg) - 0x40;
+            refresh_raw = MIN(refresh_raw, static_cast<u32>(0xFFFF));
+        }
+
+        u32 trefbw = refresh_raw + 0x40;
+        trefbw = MIN(trefbw, static_cast<u32>(0x3FFF));
+
+        WRITE_PARAM_ALL_REG(table, emc_rd_rcd, GET_CYCLE_CEIL(tRCD));
+        WRITE_PARAM_ALL_REG(table, emc_wr_rcd, GET_CYCLE_CEIL(tRCD));
+        WRITE_PARAM_ALL_REG(table, emc_rc, MIN(GET_CYCLE_CEIL(tRC), static_cast<u32>(0xB8)));
+        WRITE_PARAM_ALL_REG(table, emc_ras, MIN(GET_CYCLE_CEIL(tRAS), static_cast<u32>(0x7F)));
+        WRITE_PARAM_ALL_REG(table, emc_rrd, GET_CYCLE_CEIL(tRRD));
+        WRITE_PARAM_ALL_REG(table, emc_rfcpb, GET_CYCLE_CEIL(tRFCpb));
+        WRITE_PARAM_ALL_REG(table, emc_rfc, GET_CYCLE_CEIL(tRFCab));
+        WRITE_PARAM_ALL_REG(table, emc_rp, GET_CYCLE_CEIL(tRPpb));
+        WRITE_PARAM_ALL_REG(table, emc_txsr, MIN(GET_CYCLE_CEIL(tXSR), static_cast<u32>(0x3fe)));
+        WRITE_PARAM_ALL_REG(table, emc_txsrdll, MIN(GET_CYCLE_CEIL(tXSR), static_cast<u32>(0x3fe)));
+        WRITE_PARAM_ALL_REG(table, emc_tfaw, GET_CYCLE_CEIL(tFAW));
+        WRITE_PARAM_ALL_REG(table, emc_trpab, MIN(GET_CYCLE_CEIL(tRPab), static_cast<u32>(0x3F)));
+        WRITE_PARAM_ALL_REG(table, emc_tckesr, GET_CYCLE_CEIL(tSR));
+        WRITE_PARAM_ALL_REG(table, emc_tcke, tCKE);
+        WRITE_PARAM_ALL_REG(table, emc_tpd, GET_CYCLE_CEIL(tXP));
+        WRITE_PARAM_ALL_REG(table, emc_tclkstop, GET_CYCLE_CEIL(tXP) + 8);
+        WRITE_PARAM_ALL_REG(table, emc_r2p, tR2P);
+        WRITE_PARAM_ALL_REG(table, emc_r2w, tR2W);
+        WRITE_PARAM_ALL_REG(table, emc_w2p, tW2P);
+        WRITE_PARAM_ALL_REG(table, emc_w2r, tW2R);
+        WRITE_PARAM_ALL_REG(table, emc_rext, C.eristaEmcMaxClock < 2133001 ? 26 : 28); // rext shouldn't be causing issues?
+        WRITE_PARAM_ALL_REG(table, emc_wext, (C.eristaEmcMaxClock >= 2533000) ? 0x19 : 0x16);
+        WRITE_PARAM_ALL_REG(table, emc_refresh, refresh_raw);
+        WRITE_PARAM_ALL_REG(table, emc_pre_refresh_req_cnt, refresh_raw / 4);
+        WRITE_PARAM_ALL_REG(table, emc_trefbw, trefbw);
+        const u32 dyn_self_ref_control = (static_cast<u32>(7605.0 / tCK_avg) + 260) | (table->burst_regs.emc_dyn_self_ref_control & 0xffff0000);
+        WRITE_PARAM_ALL_REG(table, emc_dyn_self_ref_control, dyn_self_ref_control);
+        WRITE_PARAM_ALL_REG(table, emc_pdex2wr, pdex2rw);
+        WRITE_PARAM_ALL_REG(table, emc_pdex2rd, pdex2rw);
+        WRITE_PARAM_ALL_REG(table, emc_pchg2pden, GET_CYCLE_CEIL(1.75));
+        WRITE_PARAM_ALL_REG(table, emc_ar2pden, GET_CYCLE_CEIL(1.75));
+        WRITE_PARAM_ALL_REG(table, emc_pdex2cke, GET_CYCLE_CEIL(1.05));
+        WRITE_PARAM_ALL_REG(table, emc_act2pden, GET_CYCLE_CEIL(14.0));
+        WRITE_PARAM_ALL_REG(table, emc_cke2pden, /* cke2pden */ GET_CYCLE_CEIL(8.5));
+        (void) cke2pden;
+        WRITE_PARAM_ALL_REG(table, emc_pdex2mrr, GET_CYCLE_CEIL(pdex2mrr));
+        WRITE_PARAM_ALL_REG(table, emc_rw2pden, tWTPDEN);
+
+        /* This needs some clean up. */
+        constexpr double MC_ARB_DIV = 4.0;
+        constexpr u32 MC_ARB_SFA = 2;
+
+        table->burst_mc_regs.mc_emem_arb_cfg          = C.eristaEmcMaxClock           / (33.3 * 1000) / MC_ARB_DIV;
+        table->burst_mc_regs.mc_emem_arb_timing_rcd   = CEIL(GET_CYCLE_CEIL(tRCD)   / MC_ARB_DIV) - 2;
+        table->burst_mc_regs.mc_emem_arb_timing_rp    = CEIL(GET_CYCLE_CEIL(tRPpb)  / MC_ARB_DIV) - 1;
+        table->burst_mc_regs.mc_emem_arb_timing_rc    = CEIL(GET_CYCLE_CEIL(tRC)    / MC_ARB_DIV) - 1;
+        table->burst_mc_regs.mc_emem_arb_timing_ras   = CEIL(GET_CYCLE_CEIL(tRAS)   / MC_ARB_DIV) - 2;
+        table->burst_mc_regs.mc_emem_arb_timing_faw   = CEIL(GET_CYCLE_CEIL(tFAW)   / MC_ARB_DIV) - 1;
+        table->burst_mc_regs.mc_emem_arb_timing_rrd   = CEIL(GET_CYCLE_CEIL(tRRD)   / MC_ARB_DIV) - 1;
+        table->burst_mc_regs.mc_emem_arb_timing_rfcpb = CEIL(GET_CYCLE_CEIL(tRFCpb) / MC_ARB_DIV) - 1;
+        table->burst_mc_regs.mc_emem_arb_timing_rap2pre = CEIL(tR2P / MC_ARB_DIV);
+        table->burst_mc_regs.mc_emem_arb_timing_wap2pre = CEIL(tW2P / MC_ARB_DIV) + MC_ARB_SFA;
+
+        if (table->burst_mc_regs.mc_emem_arb_timing_r2r > 1) {
+            table->burst_mc_regs.mc_emem_arb_timing_r2r = CEIL(table->burst_regs.emc_rext / 4) - 1 + MC_ARB_SFA;
+        }
+
+        table->burst_mc_regs.mc_emem_arb_timing_r2w = CEIL(tR2W / MC_ARB_DIV) - 1 + MC_ARB_SFA;
+        table->burst_mc_regs.mc_emem_arb_timing_w2r = CEIL(tW2R / MC_ARB_DIV) - 1 + MC_ARB_SFA;
+
+        u32 da_turns = 0;
+        da_turns |= u8(table->burst_mc_regs.mc_emem_arb_timing_r2w / 2) << 16;
+        da_turns |= u8(table->burst_mc_regs.mc_emem_arb_timing_w2r / 2) << 24;
+        table->burst_mc_regs.mc_emem_arb_da_turns = da_turns;
+
+        u32 da_covers = 0;
+        u8 r_cover = (table->burst_mc_regs.mc_emem_arb_timing_rap2pre + table->burst_mc_regs.mc_emem_arb_timing_rp + table->burst_mc_regs.mc_emem_arb_timing_rcd) / 2;
+        u8 w_cover = (table->burst_mc_regs.mc_emem_arb_timing_wap2pre + table->burst_mc_regs.mc_emem_arb_timing_rp + table->burst_mc_regs.mc_emem_arb_timing_rcd) / 2;
+        da_covers |= (table->burst_mc_regs.mc_emem_arb_timing_rc / 2);
+        da_covers |= (r_cover << 8);
+        da_covers |= (w_cover << 16);
+        table->burst_mc_regs.mc_emem_arb_da_covers = da_covers;
+
+        table->burst_mc_regs.mc_emem_arb_misc0 = (table->burst_mc_regs.mc_emem_arb_misc0 & 0xFFE08000) | (table->burst_mc_regs.mc_emem_arb_timing_rc + 1);
+
+        table->la_scale_regs.mc_mll_mpcorer_ptsa_rate = 0x115;
+
+        if (C.eristaEmcMaxClock >= 2133000) {
+            table->la_scale_regs.mc_ftop_ptsa_rate = 0x1F;
+        } else {
+            table->la_scale_regs.mc_ftop_ptsa_rate = 0x1B;
+        }
+
+        table->la_scale_regs.mc_ptsa_grant_decrement = 0x17ff;
+
+        constexpr u32 MaskHigh = 0xFF00FFFF;
+        constexpr u32 Mask2 = 0xFFFFFF00;
+        constexpr u32 Mask3 = 0xFF00FF00;
+
+        const u32 allowance1 = static_cast<u32>(0x32000 / (C.eristaEmcMaxClock / 0x3E8)) & 0xFF;
+        const u32 allowance2 = static_cast<u32>(0x9C40  / (C.eristaEmcMaxClock / 0x3E8)) & 0xFF;
+        const u32 allowance3 = static_cast<u32>(0xB540  / (C.eristaEmcMaxClock / 0x3E8)) & 0xFF;
+        const u32 allowance4 = static_cast<u32>(0x9600  / (C.eristaEmcMaxClock / 0x3E8)) & 0xFF;
+        const u32 allowance5 = static_cast<u32>(0x8980  / (C.eristaEmcMaxClock / 0x3E8)) & 0xFF;
+
+        table->la_scale_regs.mc_latency_allowance_xusb_0 = (table->la_scale_regs.mc_latency_allowance_xusb_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_xusb_1 = (table->la_scale_regs.mc_latency_allowance_xusb_1 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_tsec_0 = (table->la_scale_regs.mc_latency_allowance_tsec_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_sdmmcaa_0 = (table->la_scale_regs.mc_latency_allowance_sdmmcaa_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_sdmmcab_0 = (table->la_scale_regs.mc_latency_allowance_sdmmcab_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_sdmmc_0 = (table->la_scale_regs.mc_latency_allowance_sdmmc_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_sdmmca_0 = (table->la_scale_regs.mc_latency_allowance_sdmmca_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_ppcs_1 = (table->la_scale_regs.mc_latency_allowance_ppcs_1 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_nvdec_0 = (table->la_scale_regs.mc_latency_allowance_nvdec_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_mpcore_0 = (table->la_scale_regs.mc_latency_allowance_mpcore_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_avpc_0 = (table->la_scale_regs.mc_latency_allowance_avpc_0 & MaskHigh) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_vic_0 = allowance3 | (table->la_scale_regs.mc_latency_allowance_vic_0 & Mask3) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_isp2_1 = (table->la_scale_regs.mc_latency_allowance_isp2_1 & Mask3) | (allowance1 << 16) | allowance1;
+        table->la_scale_regs.mc_latency_allowance_nvenc_0 = allowance4 | (table->la_scale_regs.mc_latency_allowance_nvenc_0 & Mask3) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_hc_0 = (table->la_scale_regs.mc_latency_allowance_hc_0 & Mask2) | allowance5;
+        table->la_scale_regs.mc_latency_allowance_gpu_0 = allowance2 | (table->la_scale_regs.mc_latency_allowance_gpu_0 & Mask3) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_gpu2_0 = allowance2 | (table->la_scale_regs.mc_latency_allowance_gpu2_0 & Mask3) | (allowance1 << 16);
+        table->la_scale_regs.mc_latency_allowance_hc_1 = (table->la_scale_regs.mc_latency_allowance_hc_1 & Mask2) | allowance1;
+        table->la_scale_regs.mc_latency_allowance_vi2_0 = (table->la_scale_regs.mc_latency_allowance_vi2_0 & Mask2) | allowance1;
+
+        table->dram_timings.t_rp = tRFCpb;
+        table->dram_timings.t_rfc = tRFCab;
+        table->dram_timings.rl = RL_DBI;
+        // WRITE_PARAM_ALL_REG(table, emc_obdly, obdly);
+        // WRITE_PARAM_ALL_REG(table, emc_ibdly, ibdly);
+
+        table->emc_cfg_2 = 0x11083D;
+        }

    Result MemFreqMtcTable(u32 *ptr) {
        u32 khz_list[] = {1600000, 1331200, 1065600, 800000, 665600, 408000, 204000, 102000, 68000, 40800};
@@ -730,17 +679,14 @@ namespace ams::ldr::oc::pcv::erista {
    }

    void Patch(uintptr_t mapped_nso, size_t nso_size) {
-        u32 CpuCvbDefaultMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(CpuCvbTableDefault)->freq);
-        u32 GpuCvbDefaultMaxFreq = static_cast<u32>(GetDvfsTableLastEntry(GpuCvbTableDefault)->freq);
-
        PatcherEntry<u32> patches[] = {
-            {"CPU Freq Table", CpuFreqCvbTable<false>, 1, nullptr, CpuCvbDefaultMaxFreq},
+            {"CPU Freq Table", CpuFreqCvbTable<false>, 1, nullptr, static_cast<u32>(GetDvfsTableLastEntry(CpuCvbTableDefault)->freq)},
            {"CPU Volt DVFS", &CpuVoltDvfs, 1, nullptr, 825},
            {"CPU Volt Thermals", &CpuVoltThermals, 1, nullptr, 825},
-            {"CPU Volt Dfll",  &CpuVoltDfll, 1, nullptr, 0xFFD0EAFF},
+            {"CPU Volt Dfll",  &CpuVoltDfll, 1, nullptr, 0xFFEAD0FF},
            {"GPU Volt DVFS", &GpuVoltDVFS, 1, nullptr, 810},
            {"GPU Volt Thermals", &GpuVoltThermals, 1, nullptr, 810},
-            {"GPU Freq Table", GpuFreqCvbTable<false>, 1, nullptr, GpuCvbDefaultMaxFreq},
+            {"GPU Freq Table", GpuFreqCvbTable<false>, 1, nullptr, static_cast<u32>(GetDvfsTableLastEntry(GpuCvbTableDefault)->freq)},
            {"GPU Freq Asm", &GpuFreqMaxAsm, 2, &GpuMaxClockPatternFn},
            {"GPU Freq PLL", &GpuFreqPllLimit, 1, nullptr, GpuClkPllLimit},
            {"MEM Freq Mtc", &MemFreqMtcTable, 0, nullptr, EmcClkOSLimit},
--- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp
@@ -22,7 +22,7 @@
 #include "../mtc_timing_value.hpp"
 #include "../mariko/calculate_timings.hpp"

-namespace ams::ldr::oc::pcv::mariko {
+namespace ams::ldr::hoc::pcv::mariko {

    u32 GetGpuVminVoltage() {
        for (auto e : vminTable) {
@@ -84,18 +84,18 @@ namespace ams::ldr::oc::pcv::mariko {
        }

        /* C.marikoGpuVmin is zero, auto voltage is applied. */
-        /* Get vmin depending on speedo and ram clock. */
        u32 autoVmin = GetAutoVoltage();
        PATCH_OFFSET(ptr, autoVmin);
        R_SUCCEED();
    }

    Result GpuVoltThermals(u32 *ptr) {
-        u32 vmin = std::memcmp(ptr - 3, gpuVoltThermalPattern, sizeof(gpuVoltThermalPattern));
-        if (vmin) {
+        if (std::memcmp(ptr - 3, gpuVoltThermalPattern, sizeof(gpuVoltThermalPattern))) {
            R_THROW(ldr::ResultInvalidGpuDvfs());
        }

+        u32 vmin = C.marikoGpuVmin;
+
        /* Automatic voltage. */
        if (!C.marikoGpuVmin) {
            vmin = GetAutoVoltage();
@@ -105,11 +105,10 @@ namespace ams::ldr::oc::pcv::mariko {
            PATCH_OFFSET(ptr + 9, vmin);
        } else {
            /* Manual voltage. */
-            PATCH_OFFSET(ptr,     C.marikoGpuVmin);
-            PATCH_OFFSET(ptr + 3, C.marikoGpuVmin);
-            PATCH_OFFSET(ptr + 6, C.marikoGpuVmin);
-            PATCH_OFFSET(ptr + 9, C.marikoGpuVmin);
-            vmin = C.marikoGpuVmin;
+            PATCH_OFFSET(ptr,     vmin);
+            PATCH_OFFSET(ptr + 3, vmin);
+            PATCH_OFFSET(ptr + 6, vmin);
+            PATCH_OFFSET(ptr + 9, vmin);
        }

        PATCH_OFFSET(ptr + 12, vmin);
@@ -432,9 +431,9 @@ namespace ams::ldr::oc::pcv::mariko {
        WRITE_PARAM_ALL_REG(table, emc_tfaw, GET_CYCLE_CEIL(tFAW));
        WRITE_PARAM_ALL_REG(table, emc_trpab, MIN(GET_CYCLE_CEIL(tRPab), static_cast<u32>(0x3F)));
        WRITE_PARAM_ALL_REG(table, emc_tckesr, GET_CYCLE_CEIL(tSR));
-        WRITE_PARAM_ALL_REG(table, emc_tcke, tCKE);
+        WRITE_PARAM_ALL_REG(table, emc_tcke, GET_CYCLE_CEIL(7.425) + 2);
        WRITE_PARAM_ALL_REG(table, emc_tpd, GET_CYCLE_CEIL(tXP));
-        WRITE_PARAM_ALL_REG(table, emc_tclkstop, GET_CYCLE_CEIL(tXP) + 8); // TODO analyse
+        WRITE_PARAM_ALL_REG(table, emc_tclkstop, tCLKSTOP);
        WRITE_PARAM_ALL_REG(table, emc_r2p, tR2P);
        WRITE_PARAM_ALL_REG(table, emc_r2w, tR2W);
        WRITE_PARAM_ALL_REG(table, emc_trtm, tRTM);
@@ -452,12 +451,11 @@ namespace ams::ldr::oc::pcv::mariko {
        WRITE_PARAM_ALL_REG(table, emc_dyn_self_ref_control, dyn_self_ref_control);
        WRITE_PARAM_ALL_REG(table, emc_pdex2wr, pdex2rw);
        WRITE_PARAM_ALL_REG(table, emc_pdex2rd, pdex2rw);
-        WRITE_PARAM_ALL_REG(table, emc_pchg2pden, GET_CYCLE_CEIL(1.75));
+        WRITE_PARAM_ALL_REG(table, emc_pchg2pden, GET_CYCLE_CEIL(1.763));
        WRITE_PARAM_ALL_REG(table, emc_ar2pden, GET_CYCLE_CEIL(1.75));
        WRITE_PARAM_ALL_REG(table, emc_pdex2cke, GET_CYCLE_CEIL(1.05));
        WRITE_PARAM_ALL_REG(table, emc_act2pden, GET_CYCLE_CEIL(14.0));
-        WRITE_PARAM_ALL_REG(table, emc_cke2pden, /* cke2pden */ GET_CYCLE_CEIL(8.5));
-        (void) cke2pden;
+        WRITE_PARAM_ALL_REG(table, emc_cke2pden, GET_CYCLE_CEIL(8.499));
        WRITE_PARAM_ALL_REG(table, emc_pdex2mrr, GET_CYCLE_CEIL(pdex2mrr));
        WRITE_PARAM_ALL_REG(table, emc_rw2pden, tWTPDEN);
        WRITE_PARAM_ALL_REG(table, emc_einput, einput);
--- a/Source/Atmosphere/stratosphere/loader/source/oc/ptm/ptm.cpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/ptm/ptm.cpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -18,7 +18,7 @@

 #include "ptm.hpp"

-namespace ams::ldr::oc::ptm {
+namespace ams::ldr::hoc::ptm {

 Result CpuPtmBoost(perf_conf_entry* entry) {

--- a/Source/Atmosphere/stratosphere/loader/source/oc/ptm/ptm.hpp
+++ b/Source/Atmosphere/stratosphere/loader/source/oc/ptm/ptm.hpp
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Switch-OC-Suite
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,7 @@

 #include "../oc_common.hpp"

-namespace ams::ldr::oc::ptm {
+namespace ams::ldr::hoc::ptm {

 typedef struct {
    u32 conf_id;
--- a/Source/Horizon-OC-Monitor/source/Utils.hpp
+++ b/Source/Horizon-OC-Monitor/source/Utils.hpp
@@ -83,7 +83,7 @@ Result nvdecCheck = 1;
 Result nvencCheck = 1;
 Result nvjpgCheck = 1;
 Result nifmCheck = 1;
-Result sysclkCheck = 1;
+Result sysclkCheck = 0;
 Result pwmDutyCycleCheck = 1;

 //Wi-Fi
@@ -572,21 +572,19 @@ void Misc(void*) {
        }
        
        // Get sys-clk data
-        if (R_SUCCEEDED(sysclkCheck)) {
-            SysClkContext sysclkCTX;
-            if (R_SUCCEEDED(sysclkIpcGetCurrentContext(&sysclkCTX))) {
-                realCPU_Hz = sysclkCTX.realFreqs[SysClkModule_CPU];
-                realGPU_Hz = sysclkCTX.realFreqs[SysClkModule_GPU];
-                realRAM_Hz = sysclkCTX.realFreqs[SysClkModule_MEM];
-                partLoad[SysClkPartLoad_EMC] = sysclkCTX.partLoad[SysClkPartLoad_EMC];
-                partLoad[SysClkPartLoad_EMCCpu] = sysclkCTX.partLoad[SysClkPartLoad_EMCCpu];
-                
-                realCPU_mV = sysclkCTX.voltages[HocClkVoltage_CPU]; 
-                realGPU_mV = sysclkCTX.voltages[HocClkVoltage_GPU]; 
-                realVDD2_mV = sysclkCTX.voltages[HocClkVoltage_EMCVDD2];
-                realVDDQ_mV = sysclkCTX.voltages[HocClkVoltage_EMCVDDQ_MarikoOnly];
-                realSOC_mV = sysclkCTX.voltages[HocClkVoltage_SOC];
-            }
+        SysClkContext sysclkCTX;
+        if (R_SUCCEEDED(sysclkIpcGetCurrentContext(&sysclkCTX))) {
+            realCPU_Hz = sysclkCTX.realFreqs[SysClkModule_CPU];
+            realGPU_Hz = sysclkCTX.realFreqs[SysClkModule_GPU];
+            realRAM_Hz = sysclkCTX.realFreqs[SysClkModule_MEM];
+            partLoad[SysClkPartLoad_EMC] = sysclkCTX.partLoad[SysClkPartLoad_EMC];
+            partLoad[SysClkPartLoad_EMCCpu] = sysclkCTX.partLoad[SysClkPartLoad_EMCCpu];
+            
+            realCPU_mV = sysclkCTX.voltages[HocClkVoltage_CPU]; 
+            realGPU_mV = sysclkCTX.voltages[HocClkVoltage_GPU]; 
+            realVDD2_mV = sysclkCTX.voltages[HocClkVoltage_EMCVDD2];
+            realVDDQ_mV = sysclkCTX.voltages[HocClkVoltage_EMCVDDQ_MarikoOnly];
+            realSOC_mV = sysclkCTX.voltages[HocClkVoltage_SOC];
        }
        
        // Temperatures
@@ -699,21 +697,7 @@ void Misc3(void*) {
    
    do {
        mutexLock(&mutex_Misc);
-        
-        // Get sys-clk data
-        if (R_SUCCEEDED(sysclkCheck)) {
-                SysClkContext sysclkCTX;
-                if (R_SUCCEEDED(sysclkIpcGetCurrentContext(&sysclkCTX))) {
-                    partLoad[SysClkPartLoad_EMC] = sysclkCTX.partLoad[SysClkPartLoad_EMC];
-                    partLoad[SysClkPartLoad_EMCCpu] = sysclkCTX.partLoad[SysClkPartLoad_EMCCpu];
-                    
-                    realCPU_mV = sysclkCTX.voltages[HocClkVoltage_CPU]; 
-                    realGPU_mV = sysclkCTX.voltages[HocClkVoltage_GPU]; 
-                    realSOC_mV = sysclkCTX.voltages[HocClkVoltage_SOC];
-                    realVDD2_mV = sysclkCTX.voltages[HocClkVoltage_EMCVDD2];
-                    realVDDQ_mV = sysclkCTX.voltages[HocClkVoltage_EMCVDDQ_MarikoOnly];
-            }
-        }
+
        // Temperatures
        if (R_SUCCEEDED(i2cCheck)) {
            Tmp451GetSocTemp(&SOC_temperatureF);
--- a/Source/Horizon-OC-Monitor/source/main.cpp
+++ b/Source/Horizon-OC-Monitor/source/main.cpp
@@ -446,14 +446,6 @@ public:
            if (SaltySD) {
                LoadSharedMemoryAndRefreshRate();
            }
-            if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
-                uint32_t sysClkApiVer = 0;
-                sysclkIpcGetAPIVersion(&sysClkApiVer);
-                if (sysClkApiVer < 4) {
-                    sysclkIpcExit();
-                }
-                else sysclkCheck = 0;
-            }
            if (R_SUCCEEDED(splInitialize())) {
                u64 sku = 0;
                splGetConfig(SplConfigItem_HardwareType, &sku);
@@ -466,16 +458,14 @@ public:
                }
            }
            splExit();
-
+            sysclkIpcInitialize();
        });
        Hinted = envIsSyscallHinted(0x6F);
    }

    virtual void exitServices() override {
        CloseThreads();
-        if (R_SUCCEEDED(sysclkCheck)) {
-            sysclkIpcExit();
-        }
+        sysclkIpcExit();
        shmemClose(&_sharedmemory);
        //Exit services
        clkrstExit();
@@ -530,14 +520,6 @@ public:
            if (SaltySD) {
                LoadSharedMemory();
            }
-            if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
-                uint32_t sysClkApiVer = 0;
-                sysclkIpcGetAPIVersion(&sysClkApiVer);
-                if (sysClkApiVer < 4) {
-                    sysclkIpcExit();
-                }
-                else sysclkCheck = 0;
-            }
            if (R_SUCCEEDED(splInitialize())) {
                u64 sku = 0;
                splGetConfig(SplConfigItem_HardwareType, &sku);
@@ -550,6 +532,7 @@ public:
                }
            }
            splExit();
+            sysclkIpcInitialize();
        });
        Hinted = envIsSyscallHinted(0x6F);
    }
@@ -557,9 +540,7 @@ public:
    virtual void exitServices() override {
        CloseThreads();
        shmemClose(&_sharedmemory);
-        if (R_SUCCEEDED(sysclkCheck)) {
-            sysclkIpcExit();
-        }
+        sysclkIpcExit();
        //Exit services
        clkrstExit();
        pcvExit();
@@ -617,14 +598,6 @@ public:
            if (SaltySD) {
                LoadSharedMemory();
            }
-            if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
-                uint32_t sysClkApiVer = 0;
-                sysclkIpcGetAPIVersion(&sysClkApiVer);
-                if (sysClkApiVer < 4) {
-                    sysclkIpcExit();
-                }
-                else sysclkCheck = 0;
-            }
            if (R_SUCCEEDED(splInitialize())) {
                u64 sku = 0;
                splGetConfig(SplConfigItem_HardwareType, &sku);
@@ -637,6 +610,7 @@ public:
                }
            }
            splExit();
+            sysclkIpcInitialize();
        });
        Hinted = envIsSyscallHinted(0x6F);

@@ -645,9 +619,7 @@ public:
    virtual void exitServices() override {
        CloseThreads();
        shmemClose(&_sharedmemory);
-        if (R_SUCCEEDED(sysclkCheck)) {
-            sysclkIpcExit();
-        }
+        sysclkIpcExit();
        // Exit services
        clkrstExit();
        pcvExit();
@@ -707,14 +679,6 @@ public:
            if (SaltySD) {
                LoadSharedMemoryAndRefreshRate();
            }
-            if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
-                uint32_t sysClkApiVer = 0;
-                sysclkIpcGetAPIVersion(&sysClkApiVer);
-                if (sysClkApiVer < 4) {
-                    sysclkIpcExit();
-                }
-                else sysclkCheck = 0;
-            }
            if (R_SUCCEEDED(splInitialize())) {
                u64 sku = 0;
                splGetConfig(SplConfigItem_HardwareType, &sku);
@@ -727,6 +691,7 @@ public:
                }
            }
            splExit();
+            sysclkIpcInitialize();
        });
        Hinted = envIsSyscallHinted(0x6F);
    }
@@ -734,9 +699,7 @@ public:
    virtual void exitServices() override {
        CloseThreads();
        shmemClose(&_sharedmemory);
-        if (R_SUCCEEDED(sysclkCheck)) {
-            sysclkIpcExit();
-        }
+        sysclkIpcExit();
        clkrstExit();
        pcvExit();
        tsExit();
@@ -790,14 +753,6 @@ public:
            if (SaltySD) {
                LoadSharedMemoryAndRefreshRate();
            }
-            if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
-                uint32_t sysClkApiVer = 0;
-                sysclkIpcGetAPIVersion(&sysClkApiVer);
-                if (sysClkApiVer < 4) {
-                    sysclkIpcExit();
-                }
-                else sysclkCheck = 0;
-            }
            if (R_SUCCEEDED(splInitialize())) {
                u64 sku = 0;
                splGetConfig(SplConfigItem_HardwareType, &sku);
@@ -810,6 +765,7 @@ public:
                }
            }
            splExit();
+            sysclkIpcInitialize();
        });
        Hinted = envIsSyscallHinted(0x6F);
    }
@@ -817,9 +773,7 @@ public:
    virtual void exitServices() override {
        CloseThreads();
        shmemClose(&_sharedmemory);
-        if (R_SUCCEEDED(sysclkCheck)) {
-            sysclkIpcExit();
-        }
+        sysclkIpcExit();
        clkrstExit();
        pcvExit();
        tsExit();
@@ -873,14 +827,6 @@ public:
            if (SaltySD) {
                LoadSharedMemoryAndRefreshRate();
            }
-            if (sysclkIpcRunning() && R_SUCCEEDED(sysclkIpcInitialize())) {
-                uint32_t sysClkApiVer = 0;
-                sysclkIpcGetAPIVersion(&sysClkApiVer);
-                if (sysClkApiVer < 4) {
-                    sysclkIpcExit();
-                }
-                else sysclkCheck = 0;
-            }
            if (R_SUCCEEDED(splInitialize())) {
                u64 sku = 0;
                splGetConfig(SplConfigItem_HardwareType, &sku);
@@ -893,6 +839,7 @@ public:
                }
            }
            splExit();
+            sysclkIpcInitialize();
        });
        Hinted = envIsSyscallHinted(0x6F);
    }
@@ -900,9 +847,7 @@ public:
    virtual void exitServices() override {
        CloseThreads();
        shmemClose(&_sharedmemory);
-        if (R_SUCCEEDED(sysclkCheck)) {
-            sysclkIpcExit();
-        }
+        sysclkIpcExit();
        clkrstExit();
        pcvExit();
        tsExit();
--- a/Source/Horizon-OC-Monitor/source/modes/Full.hpp
+++ b/Source/Horizon-OC-Monitor/source/modes/Full.hpp
@@ -233,12 +233,10 @@ public:
                    else if (realRAM_Hz && settings.showDeltas && (settings.showRealFreqs || settings.showTargetFreqs)) {
                        renderer->drawString(DeltaRAM_c, false, COMMON_MARGIN +  deltaOffset, height_offset, 15, (settings.textColor));
                    }
-                    if (R_SUCCEEDED(sysclkCheck)) {
-                        static std::vector<std::string> PartLoadColoredChars = {"CPU", "GPU"};
-                        //static auto loadLabelWidth = renderer->getTextDimensions("Load: ", false, 15).first;
-                        renderer->drawString("Load", false, COMMON_MARGIN, height_offset+15, 15, (settings.catColor2));
-                        renderer->drawStringWithColoredSections(RAM_load_c, false, PartLoadColoredChars, COMMON_MARGIN + valueOffset, height_offset+15, 15, (settings.textColor), settings.catColor2);
-                    }
+                    static std::vector<std::string> PartLoadColoredChars = {"CPU", "GPU"};
+                    //static auto loadLabelWidth = renderer->getTextDimensions("Load: ", false, 15).first;
+                    renderer->drawString("Load", false, COMMON_MARGIN, height_offset+15, 15, (settings.catColor2));
+                    renderer->drawStringWithColoredSections(RAM_load_c, false, PartLoadColoredChars, COMMON_MARGIN + valueOffset, height_offset+15, 15, (settings.textColor), settings.catColor2);
                }
                if (R_SUCCEEDED(Hinted)) {
                    //static auto textWidth = renderer->getTextDimensions("Total \nApplication \nApplet \nSystem \nSystem Unsafe ", false, 15).first;
--- a/Source/Horizon-OC-Monitor/source/modes/Mini.hpp
+++ b/Source/Horizon-OC-Monitor/source/modes/Mini.hpp
@@ -354,7 +354,7 @@ public:
                            else
                                width = renderer->getTextDimensions("100%@4444.4444 mV", false, fontsize).first;
                        }
-                    } else if (key == "GPU" || (key == "RAM" && settings.showRAMLoad && R_SUCCEEDED(sysclkCheck))) {
+                    } else if (key == "GPU" || (key == "RAM" && settings.showRAMLoad)) {
                        //dimensions = renderer->drawString("100.0%@4444.4", false, 0, 0, fontsize, renderer->a(0x0000));

                        if (!settings.showRAMLoadCPUGPU) {
@@ -370,7 +370,7 @@ public:
                                width = renderer->getTextDimensions("100%[100%,100%]@4444.4444 mV", false, fontsize).first;
                            }
                        }
-                    } else if (key == "RAM" && (!settings.showRAMLoad || R_FAILED(sysclkCheck))) {
+                    } else if (key == "RAM" && (!settings.showRAMLoad)) {
                        //dimensions = renderer->drawString("44444444MB@4444.4", false, 0, 0, fontsize, renderer->a(0x0000));
                        if (!settings.realVolts) {
                            width = renderer->getTextDimensions("100%@4444.4", false, fontsize).first;
@@ -993,51 +993,33 @@ public:
            } else {
                unsigned PartLoadInt;
                
-                if (R_SUCCEEDED(sysclkCheck)) {
-                    PartLoadInt = partLoad[SysClkPartLoad_EMC] / 10;
-                    
-                    if (settings.showRAMLoadCPUGPU) {
-                        unsigned ramCpuLoadInt = partLoad[SysClkPartLoad_EMCCpu] / 10;
-                        int RAM_GPU_Load = partLoad[SysClkPartLoad_EMC] - partLoad[SysClkPartLoad_EMCCpu];
-                        unsigned ramGpuLoadInt = RAM_GPU_Load / 10;
-                        
-                        if (settings.realFrequencies && realRAM_Hz) {
-                            snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
-                                     "%u%%[%u%%,%u%%]@%hu.%hhu",
-                                     PartLoadInt, ramCpuLoadInt, ramGpuLoadInt,
-                                     realRAM_Hz / 1000000, (realRAM_Hz / 100000) % 10);
-                        } else {
-                            snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
-                                     "%u%%[%u%%,%u%%]@%hu.%hhu",
-                                     PartLoadInt, ramCpuLoadInt, ramGpuLoadInt,
-                                     RAM_Hz / 1000000, (RAM_Hz / 100000) % 10);
-                        }
-                    } else {
-                        if (settings.realFrequencies && realRAM_Hz) {
-                            snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
-                                     "%u%%@%hu.%hhu", PartLoadInt,
-                                     realRAM_Hz / 1000000, (realRAM_Hz / 100000) % 10);
-                        } else {
-                            snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
-                                     "%u%%@%hu.%hhu", PartLoadInt,
-                                     RAM_Hz / 1000000, (RAM_Hz / 100000) % 10);
-                        }
-                    }
-                } else {
-                    const uint64_t RAM_Total_all = RAM_Total_application_u + RAM_Total_applet_u + 
-                                                   RAM_Total_system_u + RAM_Total_systemunsafe_u;
-                    const uint64_t RAM_Used_all = RAM_Used_application_u + RAM_Used_applet_u + 
-                                                  RAM_Used_system_u + RAM_Used_systemunsafe_u;
-                    PartLoadInt = (RAM_Total_all > 0) ? (unsigned)((RAM_Used_all * 100) / RAM_Total_all) : 0;
+                PartLoadInt = partLoad[SysClkPartLoad_EMC] / 10;
+                
+                if (settings.showRAMLoadCPUGPU) {
+                    unsigned ramCpuLoadInt = partLoad[SysClkPartLoad_EMCCpu] / 10;
+                    int RAM_GPU_Load = partLoad[SysClkPartLoad_EMC] - partLoad[SysClkPartLoad_EMCCpu];
+                    unsigned ramGpuLoadInt = RAM_GPU_Load / 10;
                    
                    if (settings.realFrequencies && realRAM_Hz) {
                        snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
-                                 "%u%%@%hu.%hhu", PartLoadInt,
-                                 realRAM_Hz / 1000000, (realRAM_Hz / 100000) % 10);
+                                    "%u%%[%u%%,%u%%]@%hu.%hhu",
+                                    PartLoadInt, ramCpuLoadInt, ramGpuLoadInt,
+                                    realRAM_Hz / 1000000, (realRAM_Hz / 100000) % 10);
                    } else {
                        snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
-                                 "%u%%@%hu.%hhu", PartLoadInt,
-                                 RAM_Hz / 1000000, (RAM_Hz / 100000) % 10);
+                                    "%u%%[%u%%,%u%%]@%hu.%hhu",
+                                    PartLoadInt, ramCpuLoadInt, ramGpuLoadInt,
+                                    RAM_Hz / 1000000, (RAM_Hz / 100000) % 10);
+                    }
+                } else {
+                    if (settings.realFrequencies && realRAM_Hz) {
+                        snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
+                                    "%u%%@%hu.%hhu", PartLoadInt,
+                                    realRAM_Hz / 1000000, (realRAM_Hz / 100000) % 10);
+                    } else {
+                        snprintf(MINI_RAM_var_compressed_c, sizeof(MINI_RAM_var_compressed_c),
+                                    "%u%%@%hu.%hhu", PartLoadInt,
+                                    RAM_Hz / 1000000, (RAM_Hz / 100000) % 10);
                    }
                }
            }
--- a/Source/Horizon-OC-Monitor/source/sysclk_ipc.c
+++ b/Source/Horizon-OC-Monitor/source/sysclk_ipc.c
@@ -1,5 +1,21 @@
 /*
- * --------------------------------------------------------------------------
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+ 
+/* --------------------------------------------------------------------------
 * "THE BEER-WARE LICENSE" (Revision 42):
 * <p-sam@d3vs.net>, <natinusala@gmail.com>, <m4x@m4xw.net>
 * wrote this file. As long as you retain this notice you can do whatever you
@@ -8,11 +24,12 @@
 * --------------------------------------------------------------------------
 */

+
 #define NX_SERVICE_ASSUME_NON_DOMAIN
-#include <sysclk/client/ipc.h>
 #include <switch.h>
 #include <string.h>
 #include <stdatomic.h>
+#include <sysclk/client/ipc.h>

 static Service g_sysclkSrv;
 static atomic_size_t g_refCnt;
@@ -20,7 +37,7 @@ static atomic_size_t g_refCnt;
 bool sysclkIpcRunning()
 {
    Handle handle;
-    const bool running = R_FAILED(smRegisterService(&handle, smEncodeName(SYSCLK_IPC_SERVICE_NAME), false, 1));
+    bool running = R_FAILED(smRegisterService(&handle, smEncodeName(SYSCLK_IPC_SERVICE_NAME), false, 1));

    if (!running)
    {
@@ -94,7 +111,10 @@ Result sysclkIpcSetOverride(SysClkModule module, u32 hz)

 Result sysclkIpcGetProfiles(u64 tid, SysClkTitleProfileList* out_profiles)
 {
-    return serviceDispatchInOut(&g_sysclkSrv, SysClkIpcCmd_GetProfiles, tid, *out_profiles);
+    return serviceDispatchIn(&g_sysclkSrv, SysClkIpcCmd_GetProfiles, tid,
+        .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
+        .buffers = {{out_profiles, sizeof(SysClkTitleProfileList)}},
+    );
 }

 Result sysclkIpcSetProfiles(u64 tid, SysClkTitleProfileList* profiles)
@@ -107,12 +127,18 @@ Result sysclkIpcSetProfiles(u64 tid, SysClkTitleProfileList* profiles)

 Result sysclkIpcGetConfigValues(SysClkConfigValueList* out_configValues)
 {
-    return serviceDispatchOut(&g_sysclkSrv, SysClkIpcCmd_GetConfigValues, *out_configValues);
+    return serviceDispatch(&g_sysclkSrv, SysClkIpcCmd_GetConfigValues,
+        .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
+        .buffers = {{out_configValues, sizeof(SysClkConfigValueList)}},
+    );
 }

 Result sysclkIpcSetConfigValues(SysClkConfigValueList* configValues)
 {
-    return serviceDispatchIn(&g_sysclkSrv, SysClkIpcCmd_SetConfigValues, *configValues);
+    return serviceDispatch(&g_sysclkSrv, SysClkIpcCmd_SetConfigValues,
+        .buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_In },
+        .buffers = {{configValues, sizeof(SysClkConfigValueList)}},
+    );
 }

 Result sysclkIpcGetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* outCount)
@@ -125,4 +151,22 @@ Result sysclkIpcGetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* o
        .buffer_attrs = { SfBufferAttr_HipcAutoSelect | SfBufferAttr_Out },
        .buffers = {{list, maxCount * sizeof(u32)}},
    );
+}
+
+Result sysclkIpcSetReverseNXRTMode(ReverseNXMode mode)
+{
+    return serviceDispatchIn(&g_sysclkSrv, SysClkIpcCmd_SetReverseNXRTMode, mode);
+}
+
+
+Result hocClkIpcSetKipData()
+{
+    u32 temp = 0;
+    return serviceDispatchIn(&g_sysclkSrv, HocClkIpcCmd_SetKipData, temp);
+}
+
+Result hocClkIpcGetKipData()
+{
+    u32 temp = 0;
+    return serviceDispatchIn(&g_sysclkSrv, HocClkIpcCmd_GetKipData, temp);
 }
--- a/Source/ReverseNX-RT.diff(deprecated)
+++ b/Source/ReverseNX-RT.diff(deprecated)
@@ -1,287 +0,0 @@
-diff --git a/Overlay/Makefile b/Overlay/Makefile
-index 9656834..3b2ebd5 100644
--- a/Overlay/Makefile
-+++ b/Overlay/Makefile
-@@ -38,7 +38,7 @@ include $(DEVKITPRO)/libnx/switch_rules
- #   NACP building is skipped as well.
- #---------------------------------------------------------------------------------
- APP_TITLE	:=	ReverseNX-RT
-APP_VERSION	:=	1.1.1
-+APP_VERSION	:=	1.1.1-OC
- 
- TARGET		:=	ReverseNX-RT-ovl
- BUILD		:=	build
-diff --git a/Overlay/source/main.cpp b/Overlay/source/main.cpp
-index 810295c..2b3aa52 100644
--- a/Overlay/source/main.cpp
-+++ b/Overlay/source/main.cpp
-@@ -1,7 +1,202 @@
- #define TESLA_INIT_IMPL // If you have more than one file using the tesla header, only define this in the main one
- #include <tesla.hpp>    // The Tesla Header
-+#include <atomic>
- #include "SaltyNX.h"
- 
-+class ModeSync {
-+public:
-+	enum ReverseNXMode {
-+		ReverseNX_NotValid = 0,
-+		ReverseNX_SystemDefault = 0,
-+		ReverseNX_Handheld,
-+		ReverseNX_Docked,
-+		ReverseNX_Undefined,
-+	};
-+
-+	void SetMode(bool isDefault, bool setDock, char* descBuf, size_t bufSize) {
-+		auto changeHandler = [this](ReverseNXMode newMode) {
-+			if (this->currentMode == ReverseNX_Undefined || this->currentMode != newMode) {
-+				if (R_FAILED(this->ipc->SetMode(newMode))) {
-+					this->ipc->ipcStatus = Ipc::IpcStatus_ConnectFailed;
-+					return;
-+				}
-+				this->currentMode = newMode;
-+			}
-+		};
-+
-+		tsl::hlp::ScopeGuard updateBufGuard([&] { this->ipc->UpdateStatusDesc(descBuf, bufSize); });
-+
-+		if (isDefault) {
-+			changeHandler(ReverseNX_SystemDefault);
-+			return;
-+		}
-+
-+		changeHandler(setDock ? ReverseNX_Docked : ReverseNX_Handheld);
-+	}
-+
-+	ModeSync() {
-+		this->ipc = new Ipc;
-+		this->ipc->Init();
-+	}
-+
-+	~ModeSync() {
-+		this->ipc->Exit();
-+		delete this->ipc;
-+	}
-+
-+protected:
-+	struct Ipc {
-+		#define API_VER 2
-+		#define SERVICE_NAME "sysclkOC"
-+
-+		enum SysClkIpcCmd {
-+			SysClkIpcCmd_GetApiVersion = 0,
-+			SysClkIpcCmd_GetConfigValues = 9,
-+			SysClkIpcCmd_SetReverseNXRTMode = 11,
-+		};
-+
-+		enum SysClkConfigValue {
-+			SysClkConfigValue_SyncReverseNXMode = 4,
-+			SysClkConfigValue_EnumMax = 8,
-+		};
-+
-+		struct SysClkConfigValueList {
-+			uint64_t values[SysClkConfigValue_EnumMax];
-+		};
-+
-+		enum IpcStatus {
-+			IpcStatus_OK,
-+
-+			IpcStatus_Unknown,
-+			IpcStatus_NotRunning,
-+			IpcStatus_InitFailed,
-+			IpcStatus_ConnectFailed,
-+			IpcStatus_UnsupportedVer,
-+
-+			IpcStatus_Count,
-+		};
-+
-+		static constexpr const char* IpcStatusStr[IpcStatus_Count] = {
-+			"",
-+
-+			"Unknown",
-+			"Err: Not running",
-+			"Err: Failed to init",
-+			"Err: Failed to connect",
-+			"Err: Unsupported version",
-+		};
-+
-+		Result Init() {
-+			Result rc = 0;
-+
-+			rc = IpcInitialize();
-+
-+			rc = GetStatus();
-+			
-+			return rc;
-+		}
-+
-+		void Exit() {
-+			if (--refCnt == 0)
-+				serviceClose(&service);
-+		}
-+
-+		bool IsServiceRunning() {
-+			Handle handle;
-+			SmServiceName name = smEncodeName(SERVICE_NAME);
-+			if (R_FAILED(smRegisterService(&handle, name, false, 1))) {
-+				return true;
-+			}
-+			svcCloseHandle(handle);
-+			smUnregisterService(name);
-+			return false;
-+		}
-+
-+		Result IpcInitialize(void) {
-+			Result rc = 0;
-+			refCnt++;
-+
-+			if (serviceIsActive(&service))
-+				return 0;
-+
-+			rc = smGetService(&service, SERVICE_NAME);
-+
-+			if (R_FAILED(rc)) {
-+				this->ipcStatus = IpcStatus_InitFailed;
-+				rc = this->ipcStatus;
-+				this->Exit();
-+				return rc;
-+			}
-+
-+			return rc;
-+		}
-+
-+		Result GetApiVersion(u32* outVer) {
-+			return serviceDispatchOut(&service, SysClkIpcCmd_GetApiVersion, *outVer);
-+		}
-+
-+		Result GetConfigValues(SysClkConfigValueList* outConfigValues) {
-+			return serviceDispatchOut(&service, SysClkIpcCmd_GetConfigValues, *outConfigValues);
-+		}
-+
-+		Result SetMode(ReverseNXMode mode) {
-+			return serviceDispatchIn(&service, SysClkIpcCmd_SetReverseNXRTMode, mode);
-+		}
-+
-+		Result GetStatus() {
-+			if (!IsServiceRunning()) {
-+				this->ipcStatus = IpcStatus_NotRunning;
-+				return this->ipcStatus;
-+			}
-+
-+			tsl::hlp::ScopeGuard exitSrvGuard([&] { this->Exit(); });
-+
-+			uint32_t api_ver;
-+			if (R_FAILED(GetApiVersion(&api_ver))) {
-+				this->ipcStatus = IpcStatus_ConnectFailed;
-+				return this->ipcStatus;
-+			}
-+
-+			if (api_ver != API_VER) {
-+				this->ipcStatus = IpcStatus_UnsupportedVer;
-+				return this->ipcStatus;
-+			}
-+
-+			SysClkConfigValueList* list = new SysClkConfigValueList;
-+			tsl::hlp::ScopeGuard listGuard([&] { delete list; });
-+
-+			if (R_FAILED(GetConfigValues(list))) {
-+				this->ipcStatus = IpcStatus_ConnectFailed;
-+				return this->ipcStatus;
-+			}
-+
-+			exitSrvGuard.dismiss();
-+
-+			shouldSync = bool(list->values[SysClkConfigValue_SyncReverseNXMode]);
-+			this->ipcStatus = IpcStatus_OK;
-+			return this->ipcStatus;
-+		}
-+
-+		void UpdateStatusDesc(char* buffer, size_t size) {
-+			snprintf(buffer, size,
-+				"Mode Sync: %s%s",
-+				IpcStatusStr[ipcStatus],
-+				(ipcStatus == IpcStatus_OK) ? (
-+					shouldSync ? "ON" : "OFF"
-+				) : ""
-+			);
-+		}
-+
-+		Service service = {};
-+		std::atomic<std::size_t> refCnt = 0;
-+		IpcStatus ipcStatus = IpcStatus_Unknown;
-+		bool shouldSync = false;
-+	};
-+
-+	Ipc* ipc = nullptr;
-+	ReverseNXMode currentMode = ReverseNX_Undefined;
-+};
-+
- bool* def = 0;
- bool* isDocked = 0;
- bool* pluginActive = 0;
-@@ -17,6 +212,7 @@ bool plugin = false;
- char DockedChar[32];
- char SystemChar[32];
- char PluginChar[36];
-+char SysclkChar[0x40];
- uint64_t PID = 0;
- Handle remoteSharedMemory = 1;
- SharedMemory _sharedmemory = {};
-@@ -73,7 +269,7 @@ bool CheckPort () {
- 
- class GuiTest : public tsl::Gui {
- public:
-	GuiTest(u8 arg1, u8 arg2, bool arg3) { }
-+	GuiTest(ModeSync* p) : modeSync(p) { }
- 
- 	// Called when this Gui gets loaded to create the UI
- 	// Allocate all elements on the heap. libtesla will make sure to clean them up when not needed anymore
-@@ -112,6 +308,7 @@ public:
- 				else {
- 					renderer->drawString(SystemChar, false, x, y+40, 20, renderer->a(0xFFFF));
- 					renderer->drawString(DockedChar, false, x, y+60, 20, renderer->a(0xFFFF));
-+					renderer->drawString(SysclkChar, false, x, y+80, 20, renderer->a(0xFFFF));
- 				}
- 			}
- 	}), 100);
-@@ -190,6 +387,8 @@ public:
- 				
- 				if (_def) sprintf(SystemChar, "Controlled by system: Yes");
- 				else sprintf(SystemChar, "Controlled by system: No");
-+			
-+				modeSync->SetMode(_def, _isDocked, SysclkChar, sizeof(SysclkChar));
- 			}
- 			else i++;
- 		}
-@@ -200,6 +399,8 @@ public:
- 	virtual bool handleInput(u64 keysDown, u64 keysHeld, const HidTouchState &touchPos, HidAnalogStickState joyStickPosLeft, HidAnalogStickState joyStickPosRight) override {
- 		return false;   // Return true here to singal the inputs have been consumed
- 	}
-+
-+	ModeSync* modeSync;
- };
- 
- class OverlayTest : public tsl::Overlay {
-@@ -248,9 +449,11 @@ public:
- 		
- 		});
- 	
-+		modeSync = new ModeSync;
- 	}  // Called at the start to initialize all services necessary for this Overlay
- 	
- 	virtual void exitServices() override {
-+		delete modeSync;
- 		shmemClose(&_sharedmemory);
- 		fsdevUnmountDevice("sdmc");
- 	}  // Callet at the end to clean up all services previously initialized
-@@ -260,8 +463,10 @@ public:
- 	virtual void onHide() override {}    // Called before overlay wants to change from visible to invisible state
- 
- 	virtual std::unique_ptr<tsl::Gui> loadInitialGui() override {
-		return initially<GuiTest>(1, 2, true);  // Initial Gui to load. It's possible to pass arguments to it's constructor like this
-+		return initially<GuiTest>(modeSync);  // Initial Gui to load. It's possible to pass arguments to it's constructor like this
- 	}
-+
-+	ModeSync* modeSync = nullptr;
- };
- 
- int main(int argc, char **argv) {
--- a/Source/clkrst_query.cpp
+++ b/Source/clkrst_query.cpp
@@ -1,241 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <inttypes.h>
-#include <unistd.h>
-#include <switch.h>
-
-/* Recompile nx-hbloader with following added in config.json "kernel_capabilities"
-    {
-        "type": "map",
-        "value": {
-            "address": "0x60006000",
-            "size": "0x1000",
-            "is_ro": false,
-            "is_io": true
-        }
-    }
-*/
-
-void waitForKey(PadState pad) {
-    while (appletMainLoop())
-    {
-        padUpdate(&pad);
-
-        u64 kDown = padGetButtonsDown(&pad);
-
-        if (kDown & HidNpadButton_A)
-            break;
-
-        if (kDown & HidNpadButton_Plus || kDown & HidNpadButton_B) {
-            consoleExit(NULL);
-            exit(0);
-        }
-
-        consoleUpdate(NULL);
-    }
-}
-
-#define CLK_RST_IO_BASE 0x60006000
-#define CLK_RST_IO_SIZE 0x1000
-
-#define REG(OFFSET)                 (*reinterpret_cast<volatile u32 *>(OFFSET))
-#define GET_BITS(VAL, HIGH, LOW)    ((VAL & ((1UL << (HIGH + 1UL)) - 1UL)) >> LOW)
-#define GET_BIT(VAL, BIT)           GET_BITS(VAL, BIT, BIT)
-
-static u64 clkrst_base = 0;
-static u64 clkrst_size = 0;
-
-// From jetson nano kernel
-typedef enum {
-    /* divider = 2 */
-    CLK_PLLX  = 5,
-    CLK_PLLM  = 2,
-    CLK_PLLMB = 37,
-    /* PLLX & PLLG are backup PLLs for CPU & GPU */
-    /* divider = 1 */
-    CLK_CCLK_G = 18, // A57 CPU cluster
-    CLK_EMC   = 36,
-} PTO_ID; // PLL Test Output Register ID
-
-/* See if GM20B clock GPC PLL regs are accessible. */
-
-#define PLLX_MISC0 0xE4
-#define PLLM_MISC2 0x9C
-
-double ptoGetMHz(PTO_ID pto_id, u32 divider = 1, u32 presel_reg = 0, u32 presel_mask = 0) {
-    u32 pre_val, val, presel_val;
-
-    if (presel_reg) {
-        val = REG(clkrst_base + presel_reg);
-        usleep(10);
-        presel_val = val & presel_mask;
-        val &= ~presel_mask;
-        val |= presel_mask;
-        REG(clkrst_base + presel_reg) = val;
-        usleep(10);
-    }
-
-    constexpr u32 cycle_count = 16;
-    pre_val = REG(clkrst_base + 0x60);
-    val = BIT(23) | BIT(13) | (cycle_count - 1);
-    val |= pto_id << 14;
-
-    REG(clkrst_base + 0x60) = val;
-    usleep(10);
-    REG(clkrst_base + 0x60) = val | BIT(10);
-    usleep(10);
-    REG(clkrst_base + 0x60) = val;
-    usleep(10);
-    REG(clkrst_base + 0x60) = val | BIT(9);
-    usleep(500);
-
-    while(REG(clkrst_base + 0x64) & BIT(31))
-        ;
-
-    val = REG(clkrst_base + 0x64);
-    val &= 0xFFFFFF;
-    val *= divider;
-
-    double rate_mhz = (u64)val * 32768. / cycle_count / 1000. / 1000.;
-    usleep(10);
-    REG(clkrst_base + 0x60) = pre_val;
-    usleep(10);
-
-    if (presel_reg) {
-        val = REG(clkrst_base + presel_reg);
-        usleep(10);
-        val &= ~presel_mask;
-        val |= presel_val;
-        REG(clkrst_base + presel_reg) = val;
-        usleep(10);
-    }
-
-    return rate_mhz;
-}
-
-int main() {
-    consoleInit(NULL);
-    PadState pad;
-    padConfigureInput(1, HidNpadStyleSet_NpadStandard);
-    padInitializeDefault(&pad);
-
-    // Get clkrst MMIO virtual address
-    Result rc = svcQueryIoMapping(&clkrst_base, &clkrst_size, CLK_RST_IO_BASE, CLK_RST_IO_SIZE);
-    if (R_FAILED(rc)) {
-        printf("[ERROR] svcQueryIoMapping: 0x%X\n", rc);
-        consoleUpdate(NULL);
-        waitForKey(pad);
-        consoleExit(NULL);
-    }
-
-    printf("clkrst_base: 0x%lX\nclkrst_size: 0x%lX\n", clkrst_base, clkrst_size);
-
-    {
-        #define CLKRST_PLLX_BASE 0xE0
-        u32 pllx_base = REG(clkrst_base + CLKRST_PLLX_BASE);
-        printf("\n"\
-                "PLLX_BASE:    0x%X\n"\
-                "PLLX_ENABLE:  %lu\n"\
-                "PLLX_REF_DIS: %lu\n"\
-                "PLLX_LOCK:    %lu\n"\
-                "PLLX_DIVP:    %lu\n"\
-                "PLLX_DIVN:    %lu\n"\
-                "PLLX_DIVM:    %lu\n",
-                pllx_base,
-                GET_BIT(pllx_base, 30),
-                GET_BIT(pllx_base, 29),
-                GET_BIT(pllx_base, 27),
-                GET_BITS(pllx_base, 24, 20),
-                GET_BITS(pllx_base, 15, 8),
-                GET_BITS(pllx_base, 7, 0));
-    }
-
-    {
-        #define CLKRST_PLLX_MISC 0xE4
-        u32 pllx_misc = REG(clkrst_base + CLKRST_PLLX_MISC);
-        printf("\n"\
-                "PLLX_MISC:          0x%X\n"\
-                "PLLX_FO_G_DISABLE:  %lu\n"\
-                "PLLX_PTS:           %lu\n"\
-                "PLLX_LOCK_ENABLE:   %lu\n",
-                pllx_misc,
-                GET_BIT(pllx_misc, 28),
-                GET_BITS(pllx_misc, 23, 22),
-                GET_BIT(pllx_misc, 18));
-    }
-
-    {
-        #define CLKRST_PLLMB_SS_CFG 0x780
-        u32 pllmb_ss_cfg = REG(clkrst_base + CLKRST_PLLMB_SS_CFG);
-        printf("\n"\
-                "PLLMB_SS_CFG: 0x%X\n"\
-                "PLLMB_EN_SDM: %lu\n"\
-                "PLLMB_EN_SSC: %lu\n",
-                pllmb_ss_cfg,
-                GET_BIT(pllmb_ss_cfg, 31),
-                GET_BIT(pllmb_ss_cfg, 30));
-    }
-
-    {
-        #define CLKRST_PLLMB_SS_CTRL1 0x784
-        u32 pllmb_ss_ctrl1 = REG(clkrst_base + CLKRST_PLLMB_SS_CTRL1);
-        printf("\n"\
-                "PLLMB_SS_CTRL1:    0x%X\n"\
-                "PLLMB_SDM_SSC_MAX: %lu\n"\
-                "PLLMB_SDM_SSC_MIN: %lu\n",
-                pllmb_ss_ctrl1,
-                GET_BITS(pllmb_ss_ctrl1, 31, 16),
-                GET_BITS(pllmb_ss_ctrl1, 15, 0));
-    }
-
-
-    {
-        #define CLKRST_PLLM_BASE 0x90
-        u32 pllm_base = REG(clkrst_base + CLKRST_PLLM_BASE);
-        printf("\n"\
-                "PLLM_BASE: 0x%X\n"\
-                "PLLM_DIVP: %lu\n"\
-                "PLLM_DIVN: %lu\n"\
-                "PLLM_DIVM: %lu\n",
-                pllm_base,
-                GET_BITS(pllm_base, 24, 20),
-                GET_BITS(pllm_base, 15, 8),
-                GET_BITS(pllm_base, 7, 0));
-    }
-
-    {
-        #define CLKRST_PLLMB_BASE 0x5e8
-        u32 pllmb_base = REG(clkrst_base + CLKRST_PLLMB_BASE);
-        printf("\n"\
-                "PLLMB_BASE: 0x%X\n"\
-                "PLLMB_DIVP: %lu\n"\
-                "PLLMB_DIVN: %lu\n"\
-                "PLLMB_DIVM: %lu\n",
-                pllmb_base,
-                GET_BITS(pllmb_base, 24, 20),
-                GET_BITS(pllmb_base, 15, 8),
-                GET_BITS(pllmb_base, 7, 0));
-    }
-
-    printf("\n"\
-           "EMC:    %6.1f MHz\n"\
-           "CCLK_G: %6.1f MHz\n"\
-           "PLLX:   %6.1f MHz\n"\
-           "PLLM:   %6.1f MHz\n"\
-           "PLLMB:  %6.1f MHz\n",
-           ptoGetMHz(CLK_EMC),
-           ptoGetMHz(CLK_CCLK_G),
-           ptoGetMHz(CLK_PLLX,  2, PLLX_MISC0, BIT(22)),
-           ptoGetMHz(CLK_PLLM,  2, PLLM_MISC2, BIT(8)),
-           ptoGetMHz(CLK_PLLMB, 2, PLLM_MISC2, BIT(9))
-           );
-
-    waitForKey(pad);
-
-    consoleExit(NULL);
-
-    return 0;
-}
--- a/Source/sys-clk/bitmap.py
+++ b/Source/sys-clk/bitmap.py
@@ -0,0 +1,53 @@
+from PIL import Image
+import argparse
+import os
+
+def image_to_rgba8888_array(image_path, output_path):
+    # Open and convert to RGBA
+    img = Image.open(image_path).convert('RGBA')
+    width, height = img.size
+
+    # Get pixel data
+    pixels = img.tobytes()
+
+    # Write as C header file
+    with open(output_path, 'w') as f:
+        f.write('// This is a automatically generated file, do not edit manually.\n')
+        f.write(f'// {os.path.basename(image_path)} - {width}x{height}\n')
+        f.write(f'const unsigned int IMG_WIDTH = {width};\n')
+        f.write(f'const unsigned int IMG_HEIGHT = {height};\n')
+        f.write('const unsigned char IMG_DATA[] = {\n    ')
+
+        for i, byte in enumerate(pixels):
+            f.write(f'0x{byte:02X}')
+            if i < len(pixels) - 1:
+                f.write(', ')
+                if (i + 1) % 12 == 0:
+                    f.write('\n    ')
+
+        f.write('\n};\n')
+
+    print(f'Converted: {width}x{height} -> {len(pixels)} bytes')
+    print(f'Output: {output_path}')
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='PNG to RGB8888 script'
+    )
+    parser.add_argument('input', help='Input image file (e.g. cat.png)')
+    parser.add_argument(
+        '-o', '--output',
+        help='Output header file (default: <input>.h)'
+    )
+
+    args = parser.parse_args()
+
+    output_path = args.output
+    if not output_path:
+        base, _ = os.path.splitext(args.input)
+        output_path = base + '.h'
+
+    image_to_rgba8888_array(args.input, output_path)
+
+if __name__ == '__main__':
+    main()
--- a/Source/sys-clk/common/include/battery.h
+++ b/Source/sys-clk/common/include/battery.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/crc32.h
+++ b/Source/sys-clk/common/include/crc32.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#pragma once
+#include <stdio.h>
+#include <stdint.h>
+
+uint32_t crc32(const uint8_t *data, size_t length) {
+    uint32_t crc = 0xFFFFFFFF;
+    
+    for (size_t i = 0; i < length; i++) {
+        crc ^= data[i];
+        for (int j = 0; j < 8; j++) {
+            crc = (crc >> 1) ^ (0xEDB88320 & -(crc & 1));
+        }
+    }
+    return ~crc;
+}
+
+uint32_t checksum_file(const char *filename) {
+    FILE *file = fopen(filename, "rb");
+    if (!file) {
+        perror("[crc32] Error opening file");
+        return 0;
+    }
+    
+    uint8_t buffer[1024];
+    uint32_t crc = 0xFFFFFFFF;
+    size_t bytes_read;
+    
+    while ((bytes_read = fread(buffer, 1, sizeof(buffer), file)) > 0) {
+        for (size_t i = 0; i < bytes_read; i++) {
+            crc ^= buffer[i];
+            for (int j = 0; j < 8; j++) {
+                crc = (crc >> 1) ^ (0xEDB88320 & -(crc & 1));
+            }
+        }
+    }
+    
+    fclose(file);
+    return ~crc;
+}
--- a/Source/sys-clk/common/include/memmem.h
+++ b/Source/sys-clk/common/include/memmem.h
@@ -0,0 +1,41 @@
+/*
+    MIT License
+
+    Copyright (c) 2024 Roy Merkel
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+#ifndef MEMMEM_IMPL_H
+#define MEMMEM_IMPL_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *memmem_impl(void *haystack, size_t haystacklen,
+                  const void *needle, size_t needlelen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/Source/sys-clk/common/include/notification.h
+++ b/Source/sys-clk/common/include/notification.h
@@ -22,7 +22,7 @@
 #include <cstdio>

 static void writeNotification(const std::string& message) {
-        const char* flagPath = "sdmc:/config/ultrahand/flags/NOTIFICATIONS.flag";
+        static const char* flagPath = "sdmc:/config/ultrahand/flags/NOTIFICATIONS.flag";

        FILE* flagFile = fopen(flagPath, "r");
        if (!flagFile) {
--- a/Source/sys-clk/common/include/registers.h
+++ b/Source/sys-clk/common/include/registers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/service_guard.h
+++ b/Source/sys-clk/common/include/service_guard.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) MasaGratoR
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 #pragma once

 #ifdef __cplusplus
--- a/Source/sys-clk/common/include/sysclk.h
+++ b/Source/sys-clk/common/include/sysclk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/sysclk/apm.h
+++ b/Source/sys-clk/common/include/sysclk/apm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/sysclk/board.h
+++ b/Source/sys-clk/common/include/sysclk/board.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -125,6 +125,21 @@ typedef enum {
    HorizonOCSpeedo_EnumMax,
 } HorizonOCSpeedo;

+typedef enum {
+    GPUUVLevel_NoUV = 0,
+    GPUUVLevel_SLT,
+    GPUUVLevel_HiOPT,
+    GPUUVLevel_EnumMax,
+} GPUUndervoltLevel;
+
+enum {
+    DVFSMode_Disabled,
+    DVFSMode_Hijack,
+    // DVFSMode_OfficialService,
+    // DVFSMode_Hack,
+    DVFSMode_EnumMax,
+};
+
 #define SYSCLK_ENUM_VALID(n, v) ((v) < n##_EnumMax)

 static inline const char* sysclkFormatModule(SysClkModule module, bool pretty)
--- a/Source/sys-clk/common/include/sysclk/client/ipc.h
+++ b/Source/sys-clk/common/include/sysclk/client/ipc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/sysclk/client/types.h
+++ b/Source/sys-clk/common/include/sysclk/client/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/sysclk/clock_manager.h
+++ b/Source/sys-clk/common/include/sysclk/clock_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/sysclk/config.h
+++ b/Source/sys-clk/common/include/sysclk/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,9 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
 */
- 
+
 /* --------------------------------------------------------------------------
 * "THE BEER-WARE LICENSE" (Revision 42):
 * <p-sam@d3vs.net>, <natinusala@gmail.com>, <m4x@m4xw.net>
@@ -41,11 +41,7 @@ typedef enum {
    HocClkConfigValue_OverwriteBoostMode,

    HocClkConfigValue_EristaMaxCpuClock,
-    HocClkConfigValue_EristaMaxGpuClock,
-    HocClkConfigValue_EristaMaxMemClock,
    HocClkConfigValue_MarikoMaxCpuClock,
-    HocClkConfigValue_MarikoMaxGpuClock,
-    HocClkConfigValue_MarikoMaxMemClock,

    HocClkConfigValue_ThermalThrottle,
    HocClkConfigValue_ThermalThrottleThreshold,
@@ -55,19 +51,16 @@ typedef enum {

    HocClkConfigValue_LiteTDPLimit,

-    HocClkConfigValue_EnforceBoardLimit,
-    
-    HocClkConfigValue_KipEditing,
-    HocClkConfigValue_KipFileName,
-
    HorizonOCConfigValue_BatteryChargeCurrent,

    HorizonOCConfigValue_OverwriteRefreshRate,
    HorizonOCConfigValue_EnableUnsafeDisplayFreqs,
-    HocClkConfigValue_FixCpuVoltBug,
+
+    HorizonOCConfigValue_DVFSMode,
+    HorizonOCConfigValue_DVFSOffset,

    KipConfigValue_custRev,
-    KipConfigValue_mtcConf,
+    // KipConfigValue_mtcConf,
    KipConfigValue_hpMode,

    KipConfigValue_commonEmcMemVolt,
@@ -165,6 +158,11 @@ typedef enum {
    KipConfigValue_g_volt_e_1036800,
    KipConfigValue_g_volt_e_1075200,

+    KipConfigValue_t6_tRTW_fine_tune,
+    KipConfigValue_t7_tWTR_fine_tune,
+
+    KipCrc32,
+    HocClkConfigValue_IsFirstLoad,
    SysClkConfigValue_EnumMax,
 } SysClkConfigValue;

@@ -194,17 +192,9 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr

        case HocClkConfigValue_EristaMaxCpuClock:
            return pretty ? "CPU Max Display Clock" : "cpu_max_e";
-        case HocClkConfigValue_EristaMaxGpuClock:
-            return pretty ? "Max GPU Clock" : "gpu_max_e";
-        case HocClkConfigValue_EristaMaxMemClock:
-            return pretty ? "Erista Max MEM Clock" : "mem_max_e";

        case HocClkConfigValue_MarikoMaxCpuClock:
            return pretty ? "CPU Max Display Clock" : "cpu_max_m";
-        case HocClkConfigValue_MarikoMaxGpuClock:
-            return pretty ? "Mariko Max GPU Clock" : "gpu_max_m";
-        case HocClkConfigValue_MarikoMaxMemClock:
-            return pretty ? "Mariko Max MEM Clock" : "mem_max_m";

        case HocClkConfigValue_ThermalThrottle:
            return pretty ? "Thermal Throttle" : "thermal_throttle";
@@ -221,32 +211,26 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
        case HocClkConfigValue_LiteTDPLimit:
            return pretty ? "Handheld TDP Limit" : "tdp_limit_l";

-        case HocClkConfigValue_EnforceBoardLimit:
-            return pretty ? "Enforce Board Limit" : "enforce_board_limit";
-
-        case HocClkConfigValue_KipEditing:
-            return pretty ? "Enable KIP Editing" : "kip_editing";
-        
-        case HocClkConfigValue_KipFileName:
-            return pretty ? "KIP File Name" : "kip_file_name";
-
        case HorizonOCConfigValue_BatteryChargeCurrent:
            return pretty ? "Battery Charge Current" : "bat_charge_current";

        case HorizonOCConfigValue_OverwriteRefreshRate:
            return pretty ? "Display Refresh Rate Changing" : "drr_changing";

-        case HocClkConfigValue_FixCpuVoltBug:
-            return pretty ? "Fix CPU Volt Bug" : "cpu_volt_bugfix";
-
        case HorizonOCConfigValue_EnableUnsafeDisplayFreqs:
            return pretty ? "Enable Unsafe Display Frequencies" : "drr_unsafe";

+        case HorizonOCConfigValue_DVFSMode:
+            return pretty ? "DVFS Mode" : "dvfs_mode";
+
+        case HorizonOCConfigValue_DVFSOffset:
+            return pretty ? "DVFS Offset" : "dvfs_offset";
+
        // KIP config values
        case KipConfigValue_custRev:
            return pretty ? "Custom Revision" : "kip_cust_rev";
-        case KipConfigValue_mtcConf:
-            return pretty ? "MTC Config" : "kip_mtc_conf";
+        // case KipConfigValue_mtcConf:
+        //     return pretty ? "MTC Config" : "kip_mtc_conf";
        case KipConfigValue_hpMode:
            return pretty ? "HP Mode" : "kip_hp_mode";

@@ -389,7 +373,12 @@ static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pr
        case KipConfigValue_g_volt_e_998400: return pretty ? "Erista GPU Volt 998 MHz" : "g_volt_e_998400";
        case KipConfigValue_g_volt_e_1036800: return pretty ? "Erista GPU Volt 1036 MHz" : "g_volt_e_1036800";
        case KipConfigValue_g_volt_e_1075200: return pretty ? "Erista GPU Volt 1075 MHz" : "g_volt_e_1075200";
-
+        case KipConfigValue_t6_tRTW_fine_tune: return pretty ? "t6 - tRTW Fine Tune" : "t6_tRTW_fine_fune";
+        case KipConfigValue_t7_tWTR_fine_tune: return pretty ? "t7 - tWTR Fine Tune" : "t7_tWTR_fine_tune";
+        case KipCrc32:
+            return pretty ? "CRC32" : "crc32";
+        case HocClkConfigValue_IsFirstLoad:
+            return pretty ? "Is First Load" : "is_first_load";
        default:
            return pretty ? "[cfg] no enum format string" : "err_no_format_string";
    }
@@ -407,37 +396,27 @@ static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val)
        case SysClkConfigValue_CsvWriteIntervalMs:
        case HocClkConfigValue_UncappedClocks:
        case HocClkConfigValue_OverwriteBoostMode:
-        case HocClkConfigValue_KipFileName:
        case HorizonOCConfigValue_BatteryChargeCurrent:
        case HorizonOCConfigValue_OverwriteRefreshRate:
        case HorizonOCConfigValue_EnableUnsafeDisplayFreqs:
            return 0ULL;
        case HocClkConfigValue_EristaMaxCpuClock:
            return 1785ULL;
-        case HocClkConfigValue_EristaMaxGpuClock:
-            return 921ULL;
-        case HocClkConfigValue_EristaMaxMemClock:
-            return 1600ULL;

        case HocClkConfigValue_MarikoMaxCpuClock:
            return 1963ULL;
-        case HocClkConfigValue_MarikoMaxGpuClock:
-            return 1075ULL;
-        case HocClkConfigValue_MarikoMaxMemClock:
-            return 1862ULL;

        case HocClkConfigValue_ThermalThrottle:
        case HocClkConfigValue_HandheldTDP:
-        case HocClkConfigValue_EnforceBoardLimit:
-        case HocClkConfigValue_KipEditing:
-        case HocClkConfigValue_FixCpuVoltBug:
+        case HocClkConfigValue_IsFirstLoad:
+        case HorizonOCConfigValue_DVFSMode:
            return 1ULL;
        case HocClkConfigValue_ThermalThrottleThreshold:
            return 70ULL;
        case HocClkConfigValue_HandheldTDPLimit:
-            return 8600ULL;
+            return 9600ULL; // 8600mW will trigger on erista stock, so raise it a bit
        case HocClkConfigValue_LiteTDPLimit:
-            return 6400ULL;
+            return 6400ULL; // 0.5C
        default:
            return 0ULL;
    }
@@ -448,17 +427,13 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
    switch(val)
    {
        case HocClkConfigValue_EristaMaxCpuClock:
-        case HocClkConfigValue_EristaMaxGpuClock:
-        case HocClkConfigValue_EristaMaxMemClock:
        case HocClkConfigValue_MarikoMaxCpuClock:
-        case HocClkConfigValue_MarikoMaxGpuClock:
-        case HocClkConfigValue_MarikoMaxMemClock:
        case HocClkConfigValue_ThermalThrottleThreshold:
        case HocClkConfigValue_HandheldTDPLimit:
        case HocClkConfigValue_LiteTDPLimit:
        case SysClkConfigValue_PollingIntervalMs:
            return input > 0;
-        
+
        case SysClkConfigValue_TempLogIntervalMs:
        case SysClkConfigValue_FreqLogIntervalMs:
        case SysClkConfigValue_PowerLogIntervalMs:
@@ -467,16 +442,13 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
        case HocClkConfigValue_OverwriteBoostMode:
        case HocClkConfigValue_ThermalThrottle:
        case HocClkConfigValue_HandheldTDP:
-        case HocClkConfigValue_EnforceBoardLimit:
-        case HocClkConfigValue_KipEditing:
-        case HocClkConfigValue_KipFileName:
        case HorizonOCConfigValue_OverwriteRefreshRate:
-        case HocClkConfigValue_FixCpuVoltBug:
        case HorizonOCConfigValue_EnableUnsafeDisplayFreqs:
+        case HocClkConfigValue_IsFirstLoad:
            return (input & 0x1) == input;
-        
+
        case KipConfigValue_custRev:
-        case KipConfigValue_mtcConf:
+        // case KipConfigValue_mtcConf:
        case KipConfigValue_hpMode:
        case KipConfigValue_commonEmcMemVolt:
        case KipConfigValue_eristaEmcMaxClock:
@@ -564,6 +536,11 @@ static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t in
        case KipConfigValue_g_volt_e_1075200:
        case KipConfigValue_eristaCpuVmin:
        case KipConfigValue_eristaCpuUnlock:
+        case KipConfigValue_t6_tRTW_fine_tune:
+        case KipConfigValue_t7_tWTR_fine_tune:
+        case KipCrc32:
+        case HorizonOCConfigValue_DVFSMode:
+        case HorizonOCConfigValue_DVFSOffset:
            return true;
        case HorizonOCConfigValue_BatteryChargeCurrent:
            return ((input >= 1024) && (input <= 3072)) || !input;
--- a/Source/sys-clk/common/include/sysclk/errors.h
+++ b/Source/sys-clk/common/include/sysclk/errors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/include/sysclk/ipc.h
+++ b/Source/sys-clk/common/include/sysclk/ipc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -31,8 +31,8 @@
 #include "board.h"
 #include "clock_manager.h"

-#define SYSCLK_IPC_API_VERSION 4
-#define SYSCLK_IPC_SERVICE_NAME "sys:clk"
+#define SYSCLK_IPC_API_VERSION 1
+#define SYSCLK_IPC_SERVICE_NAME "hoc:clk"

 enum SysClkIpcCmd
 {
@@ -51,8 +51,6 @@ enum SysClkIpcCmd
    SysClkIpcCmd_SetReverseNXRTMode = 12,
    HocClkIpcCmd_SetKipData = 13,
    HocClkIpcCmd_GetKipData = 14,
-    HocClkIpcCmd_UpdateEmcRegs = 15,
-    HocClkIpcCmd_CalculateGpuVmin = 16,
 };


--- a/Source/sys-clk/common/src/apm_profile_table.c
+++ b/Source/sys-clk/common/src/apm_profile_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/common/src/client/ipc.c
+++ b/Source/sys-clk/common/src/client/ipc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -169,15 +169,4 @@ Result hocClkIpcGetKipData()
 {
    u32 temp = 0;
    return serviceDispatchIn(&g_sysclkSrv, HocClkIpcCmd_GetKipData, temp);
-}
-
-Result hocClkIpcUpdateEmcRegs()
-{
-    u32 temp = 0;
-    return serviceDispatchIn(&g_sysclkSrv, HocClkIpcCmd_UpdateEmcRegs, temp);
-}
-Result hocClkIpcCalculateGpuVmin()
-{
-    u32 temp = 0;
-    return serviceDispatchIn(&g_sysclkSrv, HocClkIpcCmd_CalculateGpuVmin, temp);
 }
--- a/Source/sys-clk/common/src/memmem.c
+++ b/Source/sys-clk/common/src/memmem.c
@@ -0,0 +1,83 @@
+/*
+    MIT License
+
+    Copyright (c) 2024 Roy Merkel
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+#include "memmem.h"
+
+void *memmem_impl(void *haystack, size_t haystacklen, const void *needle, size_t needlelen)
+{
+	const unsigned char *cmpp;
+	const unsigned char *p;
+	const unsigned char *endp;
+	const unsigned char *q;
+	const unsigned char *endq;
+	unsigned char found;
+
+	if(haystack == NULL)
+	{
+		return NULL;
+	}
+	if(needle == NULL)
+	{
+		return haystack;
+	}
+	if(haystacklen == 0)
+	{
+		return NULL;
+	}
+	if(needlelen == 0)
+	{
+		return haystack;
+	}
+
+	if(needlelen > haystacklen)
+	{
+		return NULL;
+	}
+
+	endp = haystack + haystacklen - needlelen;
+	endq = needle + needlelen;
+	for(p = haystack; p <= endp; p++)
+	{
+		found = 1;
+		cmpp = p;
+		for(q = needle; q < endq; q++)
+		{
+			if(*cmpp != *q)
+			{
+				found = 0;
+				break;
+			}
+			else
+			{
+				cmpp++;
+			}
+		}
+		if(found)
+		{
+			return (void*)p;
+		}
+	}
+
+  return NULL;
+}
--- a/Source/sys-clk/overlay/Makefile
+++ b/Source/sys-clk/overlay/Makefile
@@ -39,7 +39,7 @@ include ${TOPDIR}/lib/libultrahand/ultrahand.mk
 # version control constants
 #---------------------------------------------------------------------------------
 #TARGET_VERSION	:= $(shell git describe --dirty --always --tags)
-APP_VERSION		:= 0.31
+APP_VERSION		:= 0.38
 TARGET_VERSION := $(APP_VERSION)

 #---------------------------------------------------------------------------------
--- a/Source/sys-clk/overlay/src/ipc.h
+++ b/Source/sys-clk/overlay/src/ipc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/main.cpp
+++ b/Source/sys-clk/overlay/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/elements/base_frame.h
+++ b/Source/sys-clk/overlay/src/ui/elements/base_frame.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/format.h
+++ b/Source/sys-clk/overlay/src/ui/format.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/about_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/about_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/about_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/about_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/app_profile_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/app_profile_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -29,6 +29,7 @@

 #include "../format.h"
 #include "fatal_gui.h"
+#include "labels.h"
 AppProfileGui::AppProfileGui(std::uint64_t applicationId, SysClkTitleProfileList* profileList)
 {
    this->applicationId = applicationId;
@@ -50,7 +51,13 @@ void AppProfileGui::openFreqChoiceGui(tsl::elm::ListItem* listItem, SysClkProfil
        FatalGui::openWithResultCode("sysclkIpcGetFreqList", rc);
        return;
    }
+    std::map<uint32_t, std::string> labels = {};

+    if (module == SysClkModule_CPU) {
+        labels = IsMariko() ? cpu_freq_label_m : cpu_freq_label_e;
+    } else if (module == SysClkModule_GPU) {
+        labels = IsMariko() ? gpu_freq_label_m : gpu_freq_label_e;
+    }
    tsl::changeTo<FreqChoiceGui>(this->profileList->mhzMap[profile][module] * 1000000, hzList, hzCount, module, [this, listItem, profile, module](std::uint32_t hz) {
        this->profileList->mhzMap[profile][module] = hz / 1000000;
        listItem->setValue(formatListFreqMHz(this->profileList->mhzMap[profile][module]));
@@ -62,7 +69,7 @@ void AppProfileGui::openFreqChoiceGui(tsl::elm::ListItem* listItem, SysClkProfil
        }

        return true;
-    }, true
+    }, true, labels
    );
 }

@@ -274,7 +281,7 @@ void AppProfileGui::addProfileUI(SysClkProfile profile)
        FatalGui::openWithResultCode("sysclkIpcGetConfigValues", rc);
        return;
    }
-    this->listElement->addItem(new tsl::elm::CategoryHeader(sysclkFormatProfile(profile, true) + std::string(" ") + ult::DIVIDER_SYMBOL + "  Reset"));
+    this->listElement->addItem(new tsl::elm::CategoryHeader(sysclkFormatProfile(profile, true) + std::string(" ") + ult::DIVIDER_SYMBOL + " \ue0e3 Reset"));
    this->addModuleListItem(profile, SysClkModule_CPU);
    this->addModuleListItem(profile, SysClkModule_GPU);
    this->addModuleListItem(profile, SysClkModule_MEM);
@@ -282,7 +289,7 @@ void AppProfileGui::addProfileUI(SysClkProfile profile)
        ValueThresholds lcdThresholds(60, 65);
        if(!IsHoag() && configList.values[HorizonOCConfigValue_OverwriteRefreshRate]) {
            if(profile != SysClkProfile_Docked)
-                this->addModuleListItemValue(profile, HorizonOCModule_Display, "Display", 40, configList.values[HorizonOCConfigValue_EnableUnsafeDisplayFreqs] ? 72 : 60, 1, " Hz", 1, 0, lcdThresholds);
+                this->addModuleListItemValue(profile, HorizonOCModule_Display, "Display", 40, configList.values[HorizonOCConfigValue_EnableUnsafeDisplayFreqs] ? IsAula() ? 65 : 72 : 60, 1, " Hz", 1, 0, lcdThresholds);
            else
                this->addModuleListItemValue(profile, HorizonOCModule_Display, "Display", 50, 120, 5, " Hz", 1, 0);
        }
--- a/Source/sys-clk/overlay/src/ui/gui/app_profile_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/app_profile_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/base_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/base_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/base_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/base_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/base_menu_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/cat.h
+++ b/Source/sys-clk/overlay/src/ui/gui/cat.h
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
 */
-
+// this is a generated file, do not edit manually.
 // cat.png - 96x128
 static const unsigned int CAT_WIDTH = 96;
 static const unsigned int CAT_HEIGHT = 128;
--- a/Source/sys-clk/overlay/src/ui/gui/fatal_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/fatal_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/fatal_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/fatal_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -59,7 +59,6 @@ tsl::elm::ListItem* FreqChoiceGui::createFreqListItem(std::uint32_t hz, bool sel
    if (selected)
        text += " \uE14B";

-    // NEW: Right-side label
    std::string rightText = "";
    auto it = labels.find(hz);
    if (it != labels.end())
@@ -137,9 +136,9 @@ void FreqChoiceGui::listUI()
                this->configList->values[HocClkConfigValue_EristaMaxCpuClock] < mhz)
                continue;

-            if (moduleName == "gpu" &&
-                this->configList->values[HocClkConfigValue_EristaMaxGpuClock] < mhz)
-                continue;
+            // if (moduleName == "gpu" &&
+            //     this->configList->values[HocClkConfigValue_EristaMaxGpuClock] < mhz)
+            //     continue;

            // if (moduleName == "mem" &&
            //     this->configList->values[HocClkConfigValue_EristaMaxMemClock] < mhz)
@@ -156,16 +155,26 @@ void FreqChoiceGui::listUI()

        if (IsMariko())
        {
-            unsafe_cpu = 1964;
-            unsafe_gpu = 1076;
-            danger_cpu = 2398;
+            unsafe_cpu = this->configList->values[KipConfigValue_marikoCpuUVHigh] ? 2296 : 1964;
+            if(this->configList->values[KipConfigValue_marikoGpuUV] == 0) {
+                unsafe_gpu = 1076;
+            } else if (this->configList->values[KipConfigValue_marikoGpuUV] == 1) {
+                unsafe_gpu = 1153;
+            } else {
+                unsafe_gpu = 1229;
+            }
+            danger_cpu = this->configList->values[KipConfigValue_marikoCpuUVHigh] ? 2500 : 2398;
            danger_gpu = 1306;
        }
        else
        {
-            unsafe_cpu = 1786;
-            unsafe_gpu = 922;
-            danger_cpu = 2092;
+            unsafe_cpu = this->configList->values[KipConfigValue_eristaCpuUV] ? 1964 : 1786;
+            if(this->configList->values[KipConfigValue_eristaGpuUV] == 0) {
+                unsafe_gpu = 922;
+            } else {
+                unsafe_gpu = 961;
+            }
+            danger_cpu = this->configList->values[KipConfigValue_eristaCpuUV] ? 2194 : 1964;
            danger_gpu = 999;
        }

--- a/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/freq_choice_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/global_override_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/global_override_gui.cpp
@@ -19,7 +19,7 @@
 #include "fatal_gui.h"
 #include "global_override_gui.h"
 #include "value_choice_gui.h"
-
+#include "labels.h"
 GlobalOverrideGui::GlobalOverrideGui()
 {
    for (std::uint16_t m = 0; m < SysClkModule_EnumMax; m++) {
@@ -38,6 +38,14 @@ void GlobalOverrideGui::openFreqChoiceGui(SysClkModule module)
        FatalGui::openWithResultCode("sysclkIpcGetFreqList", rc);
        return;
    }
+    
+    std::map<uint32_t, std::string> labels = {};
+
+    if (module == SysClkModule_CPU) {
+        labels = IsMariko() ? cpu_freq_label_m : cpu_freq_label_e;
+    } else if (module == SysClkModule_GPU) {
+        labels = IsMariko() ? gpu_freq_label_m : gpu_freq_label_e;
+    }
    tsl::changeTo<FreqChoiceGui>(
    this->context->overrideFreqs[module], hzList, hzCount, module,
    [this, module](std::uint32_t hz) {
@@ -52,7 +60,8 @@ void GlobalOverrideGui::openFreqChoiceGui(SysClkModule module)

        return true;
    },
-    true);
+    true, labels
+    );
 }

 void GlobalOverrideGui::openValueChoiceGui(
@@ -276,14 +285,14 @@ void GlobalOverrideGui::listUI()
    }

    this->listElement->addItem(new tsl::elm::CategoryHeader(
-    "Temporary Overrides " + ult::DIVIDER_SYMBOL + "  Reset"));
+    "Temporary Overrides " + ult::DIVIDER_SYMBOL + " \ue0e3 Reset"));
    this->addModuleListItem(SysClkModule_CPU);
    this->addModuleListItem(SysClkModule_GPU);
    this->addModuleListItem(SysClkModule_MEM);
    #if IS_MINIMAL == 0
        ValueThresholds lcdThresholds(60, 65);
        if(!IsHoag() && configList.values[HorizonOCConfigValue_OverwriteRefreshRate])
-            this->addModuleListItemValue(HorizonOCModule_Display, "Display", 40, configList.values[HorizonOCConfigValue_EnableUnsafeDisplayFreqs] ? 72 : 60, 1, " Hz", 1, 0, lcdThresholds);
+            this->addModuleListItemValue(HorizonOCModule_Display, "Display", 40, configList.values[HorizonOCConfigValue_EnableUnsafeDisplayFreqs] ? IsAula() ? 65 : 72 : 60, 1, " Hz", 1, 0, lcdThresholds);
    #endif
    this->addModuleToggleItem(HorizonOCModule_Governor);
 }
--- a/Source/sys-clk/overlay/src/ui/gui/global_override_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/global_override_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/labels.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/labels.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#include <map>
+#include <cstdint>
+#include <string>
+
+std::map<uint32_t, std::string> cpu_freq_label_m = {
+    {612000000, "Sleep Mode"},
+    {1020000000, "Stock"},
+    {1224000000, "Dev OC"},
+    {1785000000, "Boost Mode"},
+    {1963000000, "Safe Max"},
+    {2397000000, "Unsafe Max"},
+    {2703000000, "Absolute Max"},
+};
+
+std::map<uint32_t, std::string> cpu_freq_label_e = {
+    {612000000, "Sleep Mode"},
+    {1020000000, "Stock"},
+    {1224000000, "Dev OC"},
+    {1785000000, "Boost Mode & Safe Max"},
+    {2091000000, "Unsafe Max"},
+    {2295000000, "Absolute Max"},
+};
+std::map<uint32_t, std::string> gpu_freq_label_e = {
+    {76800000, "Boost Mode"},
+    {307200000, "Handheld"},
+    {345600000, "Handheld"},
+    {384000000, "Handheld"},
+    {422400000, "Handheld"},
+    {460800000, "Handheld Safe Max"},
+    {768000000, "Docked"},
+    {921600000, "Safe Max"},
+    {960000000, "Unsafe Max"},
+    {1075200000, "Absolute Max"},
+};
+
+std::map<uint32_t, std::string> gpu_freq_label_m = {
+    {76800000, "Boost Mode"},
+    {307200000, "Handheld"},
+    {384000000, "Handheld"},
+    {460800000, "Handheld"},
+    {614400000, "Handheld Safe Max"},
+    {768000000, "Docked"},
+    {1075200000, "Safe Max"},
+    {1305600000, "Unsafe Max"},
+    {1536000000, "Absolute Max"},
+
+};
--- a/Source/sys-clk/overlay/src/ui/gui/labels.h
+++ b/Source/sys-clk/overlay/src/ui/gui/labels.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+#pragma once
+#include <map>
+#include <cstdint>
+#include <string>
+
+extern std::map<uint32_t, std::string> cpu_freq_label_m;
+extern std::map<uint32_t, std::string> cpu_freq_label_e;
+extern std::map<uint32_t, std::string> gpu_freq_label_m;
+extern std::map<uint32_t, std::string> gpu_freq_label_e;
--- a/Source/sys-clk/overlay/src/ui/gui/main_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/main_gui.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/main_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/main_gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/misc_gui.cpp
@@ -1,6 +1,6 @@
 /*
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -23,9 +23,11 @@
 #include <cstring>
 #include <vector>
 #include <notification.h>
+#include "labels.h"
 #if IS_MINIMAL == 1
 #pragma message("Compiling with minimal features")
 #endif
+
 class RamSubmenuGui;
 class RamTimingsSubmenuGui;
 class RamLatenciesSubmenuGui;
@@ -33,25 +35,6 @@ class CpuSubmenuGui;
 class GpuSubmenuGui;
 class GpuCustomTableSubmenuGui;

-std::map<uint32_t, std::string> cpu_freq_label_m = {
-    {612000000, "Sleep Mode"},
-    {1020000000, "Stock"},
-    {1224000000, "Dev OC"},
-    {1785000000, "Boost Mode"},
-    {1963000000, "Safe Max"},
-    {2397000000, "Unsafe Max"},
-    {2805000000, "Absolute Max"},
-};
-
-std::map<uint32_t, std::string> cpu_freq_label_e = {
-    {612000000, "Sleep Mode"},
-    {1020000000, "Stock"},
-    {1224000000, "Dev OC"},
-    {1785000000, "Boost Mode & Safe Max"},
-    {2091000000, "Unsafe Max"},
-    {2295000000, "Absolute Max"},
-};
-
 MiscGui::MiscGui()
 {
    this->configList = new SysClkConfigValueList {};
@@ -265,17 +248,11 @@ void MiscGui::listUI()

    addConfigToggle(HocClkConfigValue_UncappedClocks, nullptr);
    addConfigToggle(HocClkConfigValue_OverwriteBoostMode, nullptr);
-    #if IS_MINIMAL == 0
-        addConfigToggle(HocClkConfigValue_FixCpuVoltBug, nullptr);
-    #endif
    addConfigToggle(HocClkConfigValue_ThermalThrottle, nullptr);
    addConfigToggle(HocClkConfigValue_HandheldTDP, nullptr);
-    addConfigToggle(HocClkConfigValue_EnforceBoardLimit, nullptr);
+//  addConfigToggle(HocClkConfigValue_EnforceBoardLimit, nullptr);

    #if IS_MINIMAL == 0
-        std::map<uint32_t, std::string> labels_pwr_r = {
-            {8600, "Official Rating"}
-        };
        std::map<uint32_t, std::string> labels_pwr_l = {
            {6400, "Official Rating"}
        };
@@ -291,14 +268,13 @@ void MiscGui::listUI()
                labels_pwr_l
            );
        } else {
-            ValueThresholds tdpThresholds(8600, 9500);
+            ValueThresholds tdpThresholds(9600, 11000);
            addConfigButton(
                HocClkConfigValue_HandheldTDPLimit,
                "TDP Threshold",
-                ValueRange(5000, 10000, 100, "mW", 1),
+                ValueRange(8000, 12000, 100, "mW", 1),
                "Power",
-                &tdpThresholds,
-                labels_pwr_r
+                &tdpThresholds
            );
        }

@@ -319,6 +295,45 @@ void MiscGui::listUI()
        addFreqButton(HocClkConfigValue_EristaMaxCpuClock, nullptr, SysClkModule_CPU, cpu_freq_label_e);
    }

+    if (IsMariko()) {
+        std::vector<NamedValue> dvfsValues = {
+            NamedValue("Disabled", DVFSMode_Disabled),
+            NamedValue("PCV Hijack", DVFSMode_Hijack),
+            // NamedValue("Official Service", DVFSMode_OfficialService),
+            // NamedValue("Hack", DVFSMode_Hack),
+        };
+
+        addConfigButton(
+            HorizonOCConfigValue_DVFSMode,
+            "GPU DVFS Mode",
+            ValueRange(0, 0, 1, "", 0),
+            "GPU DVFS Mode",
+            &thresholdsDisabled,
+            {},
+            dvfsValues,
+            false
+        );
+
+        std::vector<NamedValue> dvfsOffset = {
+            NamedValue("-50 mV", 0xFFFFFFCE),
+            NamedValue("-45 mV", 0xFFFFFFD3),
+            NamedValue("-40 mV", 0xFFFFFFD8),
+            NamedValue("-30 mV", 0xFFFFFFE2),
+            NamedValue("-25 mV", 0xFFFFFFE7),
+            NamedValue("-20 mV", 0xFFFFFFEC),
+            NamedValue("-10 mV", 0xFFFFFFF6),
+            NamedValue(" -5 mV", 0xFFFFFFFB),
+            NamedValue("Disabled",          0),
+            NamedValue(" +5 mV",          5),
+            NamedValue("+10 mV",         10),
+            NamedValue("+15 mV",         15),
+            NamedValue("+20 mV",         20),
+        };
+
+        addConfigButton(HorizonOCConfigValue_DVFSOffset, "GPU DVFS Offset", ValueRange(0, 12, 1, "", 0), "GPU DVFS Offset", &thresholdsDisabled, {}, dvfsOffset, false);
+
+    }
+
    this->listElement->addItem(new tsl::elm::CategoryHeader("KIP"));

    tsl::elm::ListItem* saveBtn = new tsl::elm::ListItem("Save KIP Settings");
@@ -365,46 +380,47 @@ void MiscGui::listUI()
    });
    this->listElement->addItem(gpuSubmenu);

+
    #if IS_MINIMAL == 0
-        this->listElement->addItem(new tsl::elm::CategoryHeader("Experimental"));
-        std::vector<NamedValue> chargerCurrents = {
-            NamedValue("Disabled", 0),
-            NamedValue("1024mA", 1024),
-            NamedValue("1280mA", 1280),
-            NamedValue("1536mA", 1536),
-            NamedValue("1792mA", 1792),
-            NamedValue("2048mA", 2048),
-            NamedValue("2304mA", 2304),
-            NamedValue("2560mA", 2560),
-            NamedValue("2816mA", 2816),
-            NamedValue("3072mA", 3072),
-        };
+        // std::vector<NamedValue> chargerCurrents = {
+        //     NamedValue("Disabled", 0),
+        //     NamedValue("1024mA", 1024),
+        //     NamedValue("1280mA", 1280),
+        //     NamedValue("1536mA", 1536),
+        //     NamedValue("1792mA", 1792),
+        //     NamedValue("2048mA", 2048),
+        //     NamedValue("2304mA", 2304),
+        //     NamedValue("2560mA", 2560),
+        //     NamedValue("2816mA", 2816),
+        //     NamedValue("3072mA", 3072),
+        // };
        if(!IsHoag()) {
-            std::vector<NamedValue> chargerCurrents = {
-                NamedValue("Disabled", 0),
-                NamedValue("1024mA", 1024),
-                NamedValue("1280mA", 1280),
-                NamedValue("1536mA", 1536),
-                NamedValue("1792mA", 1792),
-                NamedValue("2048mA", 2048),
-                NamedValue("2304mA", 2304),
-                NamedValue("2560mA", 2560),
-                NamedValue("2816mA", 2816),
-                NamedValue("3072mA", 3072),
-            };
+            this->listElement->addItem(new tsl::elm::CategoryHeader("Experimental"));
+            //     std::vector<NamedValue> chargerCurrents = {
+            //         NamedValue("Disabled", 0),
+            //         NamedValue("1024mA", 1024),
+            //         NamedValue("1280mA", 1280),
+            //         NamedValue("1536mA", 1536),
+            //         NamedValue("1792mA", 1792),
+            //         NamedValue("2048mA", 2048),
+            //         NamedValue("2304mA", 2304),
+            //         NamedValue("2560mA", 2560),
+            //         NamedValue("2816mA", 2816),
+            //         NamedValue("3072mA", 3072),
+            //     };

-            ValueThresholds chargerThresholds(2048, 2560);
+            //     ValueThresholds chargerThresholds(2048, 2560);

-            addConfigButton(
-                HorizonOCConfigValue_BatteryChargeCurrent,
-                "Charge Current Override",
-                ValueRange(0, 0, 1, "", 0),
-                "Charge Current Override",
-                &chargerThresholds,
-                {},
-                chargerCurrents,
-                false
-            );
+            //     addConfigButton(
+            //         HorizonOCConfigValue_BatteryChargeCurrent,
+            //         "Charge Current Override",
+            //         ValueRange(0, 0, 1, "", 0),
+            //         "Charge Current Override",
+            //         &chargerThresholds,
+            //         {},
+            //         chargerCurrents,
+            //         false
+            //     );
            addConfigToggle(HorizonOCConfigValue_OverwriteRefreshRate, nullptr);
            tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
                renderer->drawString("\uE150 Enabling unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
@@ -415,32 +431,33 @@ void MiscGui::listUI()
            warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
            this->listElement->addItem(warningText);
            addConfigToggle(HorizonOCConfigValue_EnableUnsafeDisplayFreqs, nullptr);
-        } else {
-            std::vector<NamedValue> chargerCurrents = {
-                NamedValue("Disabled", 0),
-                NamedValue("1024mA", 1024),
-                NamedValue("1280mA", 1280),
-                NamedValue("1536mA", 1536),
-                NamedValue("1792mA", 1792),
-                NamedValue("2048mA", 2048),
-                NamedValue("2304mA", 2304),
-                NamedValue("2560mA", 2560),
-            };
-
-            ValueThresholds chargerThresholds(1792, 2048);
-
-            addConfigButton(
-                HorizonOCConfigValue_BatteryChargeCurrent,
-                "Charge Current Override",
-                ValueRange(0, 0, 1, "", 0),
-                "Charge Current Override",
-                &chargerThresholds,
-                {},
-                chargerCurrents,
-                false
-            );
-
        }
+        //  else {
+        //     std::vector<NamedValue> chargerCurrents = {
+        //         NamedValue("Disabled", 0),
+        //         NamedValue("1024mA", 1024),
+        //         NamedValue("1280mA", 1280),
+        //         NamedValue("1536mA", 1536),
+        //         NamedValue("1792mA", 1792),
+        //         NamedValue("2048mA", 2048),
+        //         NamedValue("2304mA", 2304),
+        //         NamedValue("2560mA", 2560),
+        //     };
+
+        //     ValueThresholds chargerThresholds(1792, 2048);
+
+        //     addConfigButton(
+        //         HorizonOCConfigValue_BatteryChargeCurrent,
+        //         "Charge Current Override",
+        //         ValueRange(0, 0, 1, "", 0),
+        //         "Charge Current Override",
+        //         &chargerThresholds,
+        //         {},
+        //         chargerCurrents,
+        //         false
+        //     );
+
+        // }
    #endif

 }
@@ -459,8 +476,10 @@ protected:

        addConfigToggle(KipConfigValue_hpMode, "HP Mode");

+        ValueThresholds eristaRamThresholds(2208000, 2304000);
+
        std::vector<NamedValue> marikoMaxEmcClock = {
-            NamedValue("1600MHz", 1600000),
+            NamedValue("1600MHz", 1600000, "JEDEC."),
            NamedValue("1633MHz", 1633000),
            NamedValue("1666MHz", 1666000),
            NamedValue("1700MHz", 1700000),
@@ -468,17 +487,16 @@ protected:
            NamedValue("1766MHz", 1766000),
            NamedValue("1800MHz", 1800000),
            NamedValue("1833MHz", 1833000),
-            NamedValue("1862MHz", 1862400),
-            NamedValue("1866MHz", 1866000),
+            NamedValue("1866MHz", 1866000, "JEDEC."),
            NamedValue("1900MHz", 1900000),
            NamedValue("1933MHz", 1933000),
            NamedValue("1966MHz", 1966000),
-            NamedValue("1996MHz", 1996800),
+            NamedValue("1996MHz", 1996800, "JEDEC."),
            NamedValue("2000MHz", 2000000),
            NamedValue("2033MHz", 2033000),
            NamedValue("2066MHz", 2066000),
            NamedValue("2100MHz", 2100000),
-            NamedValue("2133MHz", 2133000),
+            NamedValue("2133MHz", 2133000, "JEDEC."),
            NamedValue("2166MHz", 2166000),
            NamedValue("2200MHz", 2200000),
            NamedValue("2233MHz", 2233000),
@@ -486,7 +504,7 @@ protected:
            NamedValue("2300MHz", 2300000),
            NamedValue("2333MHz", 2333000),
            NamedValue("2366MHz", 2366000),
-            NamedValue("2400MHz", 2400000),
+            NamedValue("2400MHz", 2400000, "JEDEC."),
            NamedValue("2433MHz", 2433000),
            NamedValue("2466MHz", 2466000),
            NamedValue("2500MHz", 2500000),
@@ -494,7 +512,7 @@ protected:
            NamedValue("2566MHz", 2566000),
            NamedValue("2600MHz", 2600000),
            NamedValue("2633MHz", 2633000),
-            NamedValue("2666MHz", 2666000),
+            NamedValue("2666MHz", 2666000, "JEDEC."),
            NamedValue("2700MHz", 2700000),
            NamedValue("2733MHz", 2733000),
            NamedValue("2766MHz", 2766000),
@@ -502,7 +520,7 @@ protected:
            NamedValue("2833MHz", 2833000),
            NamedValue("2866MHz", 2866000),
            NamedValue("2900MHz", 2900000),
-            NamedValue("2933MHz", 2933000),
+            NamedValue("2933MHz", 2933000, "JEDEC."),
            NamedValue("2966MHz", 2966000),
            NamedValue("3000MHz", 3000000),
            NamedValue("3033MHz", 3033000),
@@ -510,20 +528,20 @@ protected:
            NamedValue("3100MHz", 3100000),
            NamedValue("3133MHz", 3133000),
            NamedValue("3166MHz", 3166000),
-            NamedValue("3200MHz", 3200000),
-            NamedValue("3233MHz (Needs high Speedo/PLL)", 3233000),
-            NamedValue("3266MHz (Needs high Speedo/PLL)", 3266000),
-            NamedValue("3300MHz (Needs high Speedo/PLL)", 3300000),
-            NamedValue("3333MHz (Needs extreme Speedo/PLL)", 3333000),
-            NamedValue("3366MHz (Needs extreme Speedo/PLL)", 3366000),
-            NamedValue("3400MHz (Needs extreme Speedo/PLL)", 3400000),
-            NamedValue("3433MHz (Needs ridiculous Speedo/PLL)", 3433000),
-            NamedValue("3466MHz (Needs ridiculous Speedo/PLL)", 3466000),
-            NamedValue("3500MHz (Needs ridiculous Speedo/PLL)", 3500000),
+            NamedValue("3200MHz", 3200000, "JEDEC."),
+            NamedValue("3233MHz", 3233000, "High speedo needed!"),
+            NamedValue("3266MHz", 3266000, "High speedo needed!"),
+            NamedValue("3300MHz", 3300000, "High speedo needed!"),
+            // NamedValue("3333MHz (Needs extreme Speedo/PLL)", 3333000),
+            // NamedValue("3366MHz (Needs extreme Speedo/PLL)", 3366000),
+            // NamedValue("3400MHz (Needs extreme Speedo/PLL)", 3400000),
+            // NamedValue("3433MHz (Needs ridiculous Speedo/PLL)", 3433000),
+            // NamedValue("3466MHz (Needs ridiculous Speedo/PLL)", 3466000),
+            // NamedValue("3500MHz (Needs ridiculous Speedo/PLL)", 3500000),
        };

        std::vector<NamedValue> eristaMaxEmcClock = {
-            NamedValue("1600MHz", 1600000),
+            NamedValue("1600MHz", 1600000, "JEDEC."),
            NamedValue("1633MHz", 1633000),
            NamedValue("1666MHz", 1666000),
            NamedValue("1700MHz", 1700000),
@@ -531,32 +549,44 @@ protected:
            NamedValue("1766MHz", 1766000),
            NamedValue("1800MHz", 1800000),
            NamedValue("1833MHz", 1833000),
-            NamedValue("1866MHz", 1866000),
-            NamedValue("1900MHz", 1900000),
-            NamedValue("1933MHz", 1933000),
-            NamedValue("1966MHz", 1966000),
-            NamedValue("2000MHz", 2000000),
-            NamedValue("2033MHz", 2033000),
-            NamedValue("2066MHz", 2066000),
-            NamedValue("2100MHz", 2100000),
-            NamedValue("2133MHz", 2133000),
-            NamedValue("2166MHz", 2166000),
-            NamedValue("2200MHz (high power draw!)", 2200000),
-            NamedValue("2233MHz (high power draw!)", 2233000),
-            NamedValue("2266MHz (high power draw!)", 2266000),
-            NamedValue("2300MHz (high power draw!)", 2300000),
-            NamedValue("2333MHz (high power draw!)", 2333000),
-            NamedValue("2366MHz (high power draw!)", 2366000),
-            NamedValue("2400MHz (high power draw!)", 2400000),
+            NamedValue("1862MHz", 1862400, "JEDEC."),
+            NamedValue("1881MHz", 1881600),
+            NamedValue("1900MHz", 1900800),
+            NamedValue("1920MHz", 1920000),
+            NamedValue("1939MHz", 1939200),
+            NamedValue("1958MHz", 1958400),
+            NamedValue("1977MHz", 1977600),
+            NamedValue("1996MHz", 1996800, "JEDEC."),
+            NamedValue("2016MHz", 2016000),
+            NamedValue("2035MHz", 2035200),
+            NamedValue("2054MHz", 2054400),
+            NamedValue("2073MHz", 2073600),
+            NamedValue("2092MHz", 2092800),
+            NamedValue("2112MHz", 2112000),
+            NamedValue("2131MHz", 2131200, "JEDEC."),
+            NamedValue("2150MHz", 2150400),
+            NamedValue("2169MHz", 2169600),
+            NamedValue("2188MHz", 2188800),
+            NamedValue("2208MHz", 2208000),
+            NamedValue("2227MHz", 2227200),
+            NamedValue("2246MHz", 2246400),
+            NamedValue("2265MHz", 2265600),
+            NamedValue("2284MHz", 2284800),
+            NamedValue("2304MHz", 2304000),
+            NamedValue("2323MHz", 2323200),
+            NamedValue("2342MHz", 2342400),
+            NamedValue("2361MHz", 2361600),
+            NamedValue("2380MHz", 2380800),
+            NamedValue("2400MHz", 2400000, "JEDEC."),
        };

        if(IsErista()) {
            addConfigButton(
                KipConfigValue_eristaEmcMaxClock,
-                "EMC Max Clock",
+                "RAM Max Clock",
                ValueRange(0, 1, 1, "", 1),
-                "EMC Max Clock",
-                &thresholdsDisabled,
+                "RAM Max Clock",
+                &eristaRamThresholds,
                {},
                eristaMaxEmcClock,
                false
@@ -564,9 +594,9 @@ protected:
        } else {
            addConfigButton(
                KipConfigValue_marikoEmcMaxClock,
-                "EMC Max Clock",
+                "RAM Max Clock",
                ValueRange(0, 1, 1, "", 1),
-                "EMC Max Clock",
+                "RAM Max Clock",
                &thresholdsDisabled,
                {},
                marikoMaxEmcClock,
@@ -586,7 +616,7 @@ protected:
        ValueThresholds vdd2Thresholds(1212500, 1250000);
        addConfigButton(
            KipConfigValue_commonEmcMemVolt,
-            "EMC VDD2 Voltage",
+            "RAM VDD2 Voltage",
            ValueRange(912500, 1350000, 12500, "mV", 1000, 1),
            "Voltage",
            &vdd2Thresholds,
@@ -598,9 +628,9 @@ protected:
        if(IsMariko()) {
            addConfigButton(
                KipConfigValue_marikoEmcVddqVolt,
-                "EMC VDDQ Voltage",
-                ValueRange(550000, 700000, 5000, "mV", 1000),
-                "EMC VDDQ Voltage",
+                "RAM VDDQ Voltage",
+                ValueRange(400000, 700000, 5000, "mV", 1000),
+                "RAM VDDQ Voltage",
                &thresholdsDisabled,
                {},
                {},
@@ -610,16 +640,16 @@ protected:

        addConfigButton(
            KipConfigValue_emcDvbShift,
-            "DVB Shift",
+            "SoC DVB Shift",
            ValueRange(0, 10, 1, "", 1),
-            "DVB Shift",
+            "SoC DVB Shift",
            &thresholdsDisabled,
            {},
            {},
            false
        );

-        tsl::elm::ListItem* timingsSubmenu = new tsl::elm::ListItem("Memory Timings");
+        tsl::elm::ListItem* timingsSubmenu = new tsl::elm::ListItem("RAM Timing Reductions");
        timingsSubmenu->setClickListener([](u64 keys) {
            if (keys & HidNpadButton_A) {
                tsl::changeTo<RamTimingsSubmenuGui>();
@@ -629,7 +659,7 @@ protected:
        });
        this->listElement->addItem(timingsSubmenu);

-        tsl::elm::ListItem* latenciesSubmenu = new tsl::elm::ListItem("Memory Latencies");
+        tsl::elm::ListItem* latenciesSubmenu = new tsl::elm::ListItem("RAM Latencies");
        latenciesSubmenu->setClickListener([](u64 keys) {
            if (keys & HidNpadButton_A) {
                tsl::changeTo<RamLatenciesSubmenuGui>();
@@ -659,34 +689,28 @@ protected:
        addConfigButton(KipConfigValue_t6_tRTW, "t6 tRTW", ValueRange(0, 10, 1, "", 1), "tRTW", &thresholdsDisabled, {}, {}, false);
        addConfigButton(KipConfigValue_t7_tWTR, "t7 tWTR", ValueRange(0, 10, 1, "", 1), "tWTR", &thresholdsDisabled, {}, {}, false);
        addConfigButton(KipConfigValue_t8_tREFI, "t8 tREFI", ValueRange(0, 6, 1, "", 1), "tREFI", &thresholdsDisabled, {}, {}, false);
-        #if IS_MINIMAL == 0
-        this->listElement->addItem(new tsl::elm::CategoryHeader("Experimental"));
-        
-        tsl::elm::ListItem* emcUpdBtn = new tsl::elm::ListItem("Update RAM Timings");
-        emcUpdBtn->setClickListener([this](u64 keys) {
-            if (keys & HidNpadButton_A) {
-                if(this->context->freqs[SysClkModule_MEM] > 1600000000) {
-                    Result rc = hocClkIpcUpdateEmcRegs();
-                    if (R_FAILED(rc)) {
-                        FatalGui::openWithResultCode("hocClkIpcUpdateEmcRegs", rc);
-                        return false;
-                    }
-                    return true;
-                } else {
-                    writeNotification("Horizon OC\nSet your ram frequency to max\nbefore applying timings!");
-                }
-            }
-            return false;
-        });

-        this->listElement->addItem(emcUpdBtn);
-        tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
-            renderer->drawString("\uE150 This feature is EXPERIMENTAL", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
-            renderer->drawString("and should only be used for testing!", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
-        });
-        warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 70);
-        this->listElement->addItem(warningText);
-        #endif
+        std::vector<NamedValue> t6_tRTW_fine_tune = {
+            NamedValue("-2", 0xFFFFFFFE),
+            NamedValue("-1", 0xFFFFFFFF),
+            NamedValue(" 0", 0),
+            NamedValue("+1", 1),
+            NamedValue("+2", 2),
+        };
+
+        std::vector<NamedValue> t7_tWTR_fine_tune = {
+            NamedValue("-3", 0xFFFFFFFD),
+            NamedValue("-2", 0xFFFFFFFE),
+            NamedValue("-1", 0xFFFFFFFF),
+            NamedValue(" 0", 0),
+            NamedValue("+1", 1),
+            NamedValue("+2", 2),
+            NamedValue("+3", 3),
+        };
+
+        this->listElement->addItem(new tsl::elm::CategoryHeader("Advanced"));
+        addConfigButton(KipConfigValue_t6_tRTW_fine_tune, "t6 tRTW Fine Tune", ValueRange(0, 4, 1, "", 0), "tRTW Fine Tune", &thresholdsDisabled, {}, t6_tRTW_fine_tune, false);
+        addConfigButton(KipConfigValue_t7_tWTR_fine_tune, "t7 tWTR Fine Tune", ValueRange(0, 6, 1, "", 0), "tWTR Fine Tune", &thresholdsDisabled, {}, t7_tWTR_fine_tune, false);
    }
 };

@@ -701,17 +725,17 @@ protected:
        this->listElement->addItem(new tsl::elm::CategoryHeader("Memory Latencies"));

        std::vector<NamedValue> rlLabels = {
-            NamedValue("1333RL", 28),
-            NamedValue("1600RL", 32),
-            NamedValue("1866RL", 36),
-            NamedValue("2133RL", 40)
+            NamedValue("1333 RL", 28),
+            NamedValue("1600 RL", 32),
+            NamedValue("1866 RL", 36),
+            NamedValue("2133 RL", 40)
        };

        std::vector<NamedValue> wlLabels = {
-            NamedValue("1333WL", 12),
-            NamedValue("1600WL", 14),
-            NamedValue("1866WL", 16),
-            NamedValue("2133WL", 18)
+            NamedValue("1333 WL", 12),
+            NamedValue("1600 WL", 14),
+            NamedValue("1866 WL", 16),
+            NamedValue("2133 WL", 18)
        };

        addConfigButton(
@@ -747,11 +771,51 @@ protected:
        ValueThresholds thresholdsDisabled(0, 0);

        this->listElement->addItem(new tsl::elm::CategoryHeader("CPU Settings"));
-        if(IsMariko())
-            addFreqButton(KipConfigValue_marikoCpuBoostClock, nullptr, SysClkModule_CPU, cpu_freq_label_m);
-        else
-            addFreqButton(KipConfigValue_eristaCpuBoostClock, nullptr, SysClkModule_CPU, cpu_freq_label_e);
-
+        if(IsMariko()) {
+            std::vector<NamedValue> ClkOptions = {
+                NamedValue("1785 MHz", 1785000),
+                NamedValue("1887 MHz", 1887000),
+                NamedValue("1963 MHz", 1963000),
+                NamedValue("2091 MHz", 2091000),
+                NamedValue("2193 MHz", 2193000),
+                NamedValue("2295 MHz", 2295000),
+                NamedValue("2397 MHz", 2397000),
+                NamedValue("2499 MHz", 2499000),
+                NamedValue("2601 MHz", 2601000),
+                NamedValue("2703 MHz", 2703000),
+            };
+            ValueThresholds mCpuClockThresholds(1963000, 2397000);
+            addConfigButton(
+                KipConfigValue_marikoCpuBoostClock,
+                "CPU Boost Clock",
+                ValueRange(0, 0, 1, "", 1),
+                "CPU Boost Clock",
+                &mCpuClockThresholds,
+                {},
+                ClkOptions,
+                false
+            );
+        } else {
+            std::vector<NamedValue> ClkOptionsE = {
+                NamedValue("1785 MHz", 1785000),
+                NamedValue("1887 MHz", 1887000),
+                NamedValue("1963 MHz", 1963000),
+                NamedValue("2091 MHz", 2091000),
+                NamedValue("2193 MHz", 2193000),
+                NamedValue("2295 MHz", 2295000),
+            };
+            ValueThresholds eCpuClockThresholds(1785000, 2091000);
+            addConfigButton(
+                KipConfigValue_eristaCpuBoostClock,
+                "CPU Boost Clock",
+                ValueRange(0, 0, 1, "", 1),
+                "CPU Boost Clock",
+                &eCpuClockThresholds,
+                {},
+                ClkOptionsE,
+                false
+            );
+        }
        if(IsErista()) {
            addConfigButton(
                KipConfigValue_eristaCpuUV,
@@ -826,6 +890,8 @@ protected:
            );

            std::vector<NamedValue> maxClkOptions = {
+                NamedValue("1785 MHz", 1785000),
+                NamedValue("1887 MHz", 1887000),
                NamedValue("1963 MHz", 1963000),
                NamedValue("2091 MHz", 2091000),
                NamedValue("2193 MHz", 2193000),
@@ -896,7 +962,7 @@ protected:
        this->listElement->addItem(new tsl::elm::CategoryHeader("GPU Settings"));

        std::vector<NamedValue> gpuUvConf = {
-            NamedValue("No UV", 0),
+            NamedValue("No Undervolt", 0),
            NamedValue("SLT Table", 1),
            NamedValue("HiOPT Table", 2),
        };
@@ -940,9 +1006,9 @@ protected:
            );
            addConfigButton(
                KipConfigValue_eristaGpuVmin,
-                "GPU VMIN",
+                "GPU Minimum Voltage",
                ValueRange(700, 875, 5, "mV", 1),
-                "GPU VMIN",
+                "GPU Minimum Voltage",
                &thresholdsDisabled,
                {},
                {},
@@ -977,9 +1043,9 @@ protected:
            ValueThresholds MgpuVmaxThresholds(800, 850);
            addConfigButton(
                KipConfigValue_marikoGpuVmax,
-                "GPU VMAX",
+                "GPU Maximum Voltage",
                ValueRange(750, 960, 5, "mV", 1),
-                "GPU VMAX",
+                "GPU Maximum Voltage",
                &MgpuVmaxThresholds,
                {},
                {},
@@ -989,9 +1055,9 @@ protected:

        addConfigButton(
            KipConfigValue_commonGpuVoltOffset,
-            "GPU Volt Offset",
+            "GPU Voltage Offset",
            ValueRange(0, 50, 5, "mV", 1),
-            "GPU Volt Offset",
+            "GPU Voltage Offset",
            &thresholdsDisabled,
            {},
            {},
@@ -1016,6 +1082,13 @@ public:

 protected:
    void listUI() override {
+
+        Result rc = sysclkIpcGetConfigValues(this->configList); // populate config list early otherwise wont work
+        if (R_FAILED(rc)) [[unlikely]] {
+            FatalGui::openWithResultCode("sysclkIpcGetConfigValues", rc);
+            return;
+        }
+
        this->listElement->addItem(new tsl::elm::CategoryHeader("GPU Custom Table (mV)"));

        ValueThresholds MgpuVmaxThresholds(800, 850);
@@ -1146,7 +1219,7 @@ protected:
        };

        if (IsMariko()) {
-            
+
            tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
                renderer->drawString("\uE150 Setting GPU Clocks past", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
                renderer->drawString("1075MHz without UV, 1152MHz on SLT", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
@@ -1171,16 +1244,20 @@ protected:
            addConfigButton(KipConfigValue_g_volt_921600, "921.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
            addConfigButton(KipConfigValue_g_volt_998400, "998.4MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
            addConfigButton(KipConfigValue_g_volt_1075200, "1075.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_1152000, "1152.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_1228800, "1228.8MHz (SLT/HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_1267200, "1267.2MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_1305600, "1305.6MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_1344000, "1344.0MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
-            addConfigButton(KipConfigValue_g_volt_1382400, "1382.4MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
-            addConfigButton(KipConfigValue_g_volt_1420800, "1420.8MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
-            addConfigButton(KipConfigValue_g_volt_1459200, "1459.2MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
-            addConfigButton(KipConfigValue_g_volt_1497600, "1497.6MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
-            addConfigButton(KipConfigValue_g_volt_1536000, "1536.0MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+            if(this->configList->values[KipConfigValue_marikoGpuUV] >= GPUUVLevel_SLT)
+                addConfigButton(KipConfigValue_g_volt_1152000, "1152.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
+            if(this->configList->values[KipConfigValue_marikoGpuUV] >= GPUUVLevel_HiOPT) {
+                addConfigButton(KipConfigValue_g_volt_1228800, "1228.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
+                addConfigButton(KipConfigValue_g_volt_1267200, "1267.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
+                addConfigButton(KipConfigValue_g_volt_1305600, "1305.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts, false);
+                addConfigButton(KipConfigValue_g_volt_1344000, "1344.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+                addConfigButton(KipConfigValue_g_volt_1382400, "1382.4MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+                addConfigButton(KipConfigValue_g_volt_1420800, "1420.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+                addConfigButton(KipConfigValue_g_volt_1459200, "1459.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+                addConfigButton(KipConfigValue_g_volt_1497600, "1497.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+                addConfigButton(KipConfigValue_g_volt_1536000, "1536.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &MgpuVmaxThresholds, {}, mGpuVolts_noAuto, false);
+            }
+
        } else {

            tsl::elm::CustomDrawer* warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
@@ -1216,10 +1293,13 @@ protected:
            addConfigButton(KipConfigValue_g_volt_e_844800, "844.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
            addConfigButton(KipConfigValue_g_volt_e_883200, "883.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
            addConfigButton(KipConfigValue_g_volt_e_921600, "921.6MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_e_960000, "960.0MHz (SLT/HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_e_998400, "998.4MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
-            addConfigButton(KipConfigValue_g_volt_e_1036800, "1036.8MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false);
-            addConfigButton(KipConfigValue_g_volt_e_1075200, "1075.2MHz (HiOPT Only)", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false);
+            if(this->configList->values[KipConfigValue_eristaGpuUV] >= GPUUVLevel_SLT)
+                addConfigButton(KipConfigValue_g_volt_e_960000, "960.0MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
+            if(this->configList->values[KipConfigValue_eristaGpuUV] >= GPUUVLevel_HiOPT) {
+                addConfigButton(KipConfigValue_g_volt_e_998400, "998.4MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts, false);
+                addConfigButton(KipConfigValue_g_volt_e_1036800, "1036.8MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false);
+                addConfigButton(KipConfigValue_g_volt_e_1075200, "1075.2MHz", ValueRange(0, 0, 0, "0", 1), "Voltage", &EgpuVmaxThresholds, {}, eGpuVolts_noAuto, false);
+            }
        }
    }
 };
--- a/Source/sys-clk/overlay/src/ui/gui/misc_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/misc_gui.h
@@ -1,7 +1,7 @@

 /*
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/ult_ext.h
+++ b/Source/sys-clk/overlay/src/ui/gui/ult_ext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/value_choice_gui.cpp
+++ b/Source/sys-clk/overlay/src/ui/gui/value_choice_gui.cpp
@@ -1,7 +1,7 @@

 /*
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/gui/value_choice_gui.h
+++ b/Source/sys-clk/overlay/src/ui/gui/value_choice_gui.h
@@ -1,7 +1,7 @@

 /*
 *
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/overlay/src/ui/style.h
+++ b/Source/sys-clk/overlay/src/ui/style.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/Makefile
+++ b/Source/sys-clk/sysmodule/Makefile
@@ -39,7 +39,7 @@ DEFINES	:=	-DDISABLE_IPC -DTARGET="\"$(TARGET)\"" -DTARGET_VERSION="\"$(TARGET_V

 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE

-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+CFLAGS	:=	-g -Wall -Os -ffunction-sections \
 			$(ARCH) $(DEFINES)

 CFLAGS	+=	$(INCLUDE) -D__SWITCH__
--- a/Source/sys-clk/sysmodule/lib/minIni/include/minIni.h
+++ b/Source/sys-clk/sysmodule/lib/minIni/include/minIni.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/apm_ext.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/apm_ext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/cpp/lockable_mutex.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/cpp/lockable_mutex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/i2c.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/i2c.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/ipc_server.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/ipc_server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/max17050.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/max17050.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/t210.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/t210.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/tmp451.h
+++ b/Source/sys-clk/sysmodule/lib/nxExt/include/nxExt/tmp451.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/src/apm_ext.c
+++ b/Source/sys-clk/sysmodule/lib/nxExt/src/apm_ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/src/i2c.c
+++ b/Source/sys-clk/sysmodule/lib/nxExt/src/i2c.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/src/ipc_server.c
+++ b/Source/sys-clk/sysmodule/lib/nxExt/src/ipc_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/Source/sys-clk/sysmodule/lib/nxExt/src/t210.c
+++ b/Source/sys-clk/sysmodule/lib/nxExt/src/t210.c
@@ -1,6 +1,7 @@
 /*
 * Copyright (c) 2020-2023 CTCaer
 * Copyright (c) 2023 p-sam
+ * Copyright (c) 2026 Souldbminer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -47,7 +48,7 @@

 #define PTO_CLK_CNT_BUSY         BIT(31)
 #define PTO_CLK_CNT              0xFFFFFF
-#define CLK_PTO_CCLK_G           0x12
+#define CLK_PTO_CCLK_G_DIV2      0x13
 #define CLK_PTO_EMC              0x24

 #define CLOCK(x) (*(volatile u32 *)(g_clk_base + (x)))
@@ -117,7 +118,7 @@ static u32 g_mem_freq = 0;
 static u32 g_emc_lall = 0;
 static u32 g_emc_lcpu = 0;

-static u32 _clock_get_dev_freq(u32 id)
+static u32 _clock_get_dev_freq(u32 id, u32 multiplier)
 {
    const u32 pto_win = 16;
    const u32 pto_osc = 32768;
@@ -148,7 +149,7 @@ static u32 _clock_get_dev_freq(u32 id)
    (void)CLOCK(CLK_RST_CONTROLLER_PTO_CLK_CNT_CNTL);
    usleep(2);

-    u32 freq_khz = (u64)cnt * pto_osc / pto_win / 1000;
+    u32 freq_khz = (u64)cnt * multiplier * pto_osc / pto_win;

    return freq_khz;
 }
@@ -203,8 +204,8 @@ static void _clock_update_freqs(void)
        return;
    }

-    g_mem_freq = _clock_get_dev_freq(CLK_PTO_EMC) * 1000;
-    g_cpu_freq = _clock_get_dev_freq(CLK_PTO_CCLK_G) * 1000;
+    g_mem_freq = _clock_get_dev_freq(CLK_PTO_EMC, 1);
+    g_cpu_freq = _clock_get_dev_freq(CLK_PTO_CCLK_G_DIV2, 2);

    if (!g_gpu_base)
    {
--- a/Source/sys-clk/sysmodule/perms.json
+++ b/Source/sys-clk/sysmodule/perms.json
@@ -1,5 +1,5 @@
 {
-	"name": "sys:clk",
+	"name": "hoc:clk",
 	"title_id": "0x00FF0000636C6BFF",
 	"title_id_range_min": "0x00FF0000636C6BFF",
 	"title_id_range_max": "0x00FF0000636C6BFF",
@@ -18,7 +18,7 @@
 		"*"
 	],
 	"service_host": [
-		"sys:clk"
+		"hoc:clk"
 	],
 	"kernel_capabilities": [
 		{
--- a/Source/sys-clk/sysmodule/src/board.cpp
+++ b/Source/sys-clk/sysmodule/src/board.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,9 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
 */
- 
+
 /* --------------------------------------------------------------------------
 * "THE BEER-WARE LICENSE" (Revision 42):
 * <p-sam@d3vs.net>, <natinusala@gmail.com>, <m4x@m4xw.net>
@@ -41,6 +41,7 @@
 #include <cstring>
 #include <registers.h>
 #include <notification.h>
+#include <memmem.h>

 #define MAX(A, B)   std::max(A, B)
 #define MIN(A, B)   std::min(A, B)
@@ -96,9 +97,23 @@ std::atomic<uint64_t> idletick2{systemtickfrequency};
 std::atomic<uint64_t> idletick3{systemtickfrequency};
 u32 cpu0, cpu1, cpu2, cpu3, cpuAvg;
 u16 cpuSpeedo0, cpuSpeedo2, socSpeedo0; // CPU, GPU, SOC
+u32 speedoBracket;
 u16 cpuIDDQ, gpuIDDQ, socIDDQ;
 u8 g_dramID = 0;

+static const u32 ramBrackets[][22] = {
+    { 2133, 2200, 2266, 2300, 2366, 2400, 2433, 2466, 2533, 2566, 2600, 2633, 2700, 2733, 2766, 2833, 2866, 2900, 2933, 3033, 3066, 3100, },
+    { 2300, 2366, 2433, 2466, 2533, 2566, 2633, 2700, 2733, 2800, 2833, 2900, 2933, 2966, 3033, 3066, 3100, 3133, 3166, 3200, 3233, 3266, },
+    { 2433, 2466, 2533, 2600, 2666, 2733, 2766, 2800, 2833, 2866, 2933, 2966, 3033, 3066, 3100, 3133, 3166, 3200, 3233, 3300, 3333, 3366, },
+    { 2500, 2533, 2600, 2633, 2666, 2733, 2800, 2866, 2900, 2966, 3033, 3100, 3166, 3200, 3233, 3266, 3300, 3333, 3366, 3400, 3400, 3400, },
+};
+
+static const u32 gpuDvfsArray[] = { 590, 600, 610, 620, 630, 640, 650, 660, 670, 680, 690, 700, 710, 720, 730, 740, 750, 760, 770, 780, 790, 800};
+
+u32 dvfsTable[6][32] = {};
+u64 dvfsAddress;
+u32 ramVmin;
+
 const char* Board::GetModuleName(SysClkModule module, bool pretty)
 {
    ASSERT_ENUM_VALID(SysClkModule, module);
@@ -311,7 +326,7 @@ void Board::fuseReadSpeedos() {
                cpuIDDQ = *reinterpret_cast<const u16*>(dump + FUSE_CPU_IDDQ_CALIB);
                gpuIDDQ = *reinterpret_cast<const u16*>(dump + FUSE_SOC_IDDQ_CALIB);
                socIDDQ = *reinterpret_cast<const u16*>(dump + FUSE_GPU_IDDQ_CALIB);
-                
+
                svcCloseHandle(debug);
                return;
            }
@@ -436,13 +451,22 @@ void Board::SetHz(SysClkModule module, std::uint32_t hz)
        ASSERT_RESULT_OK(rc, "clkrstOpenSession");
        rc = clkrstSetClockRate(&session, hz);
        ASSERT_RESULT_OK(rc, "clkrstSetClockRate");
-
+        if (module == SysClkModule_CPU) {
+            svcSleepThread(300'000);
+            rc = clkrstSetClockRate(&session, hz);
+            ASSERT_RESULT_OK(rc, "clkrstSetClockRate");
+        }
        clkrstCloseSession(&session);
    }
    else
    {
        rc = pcvSetClockRate(Board::GetPcvModule(module), hz);
        ASSERT_RESULT_OK(rc, "pcvSetClockRate");
+        if (module == SysClkModule_CPU) {
+            svcSleepThread(300'000);
+            rc = pcvSetClockRate(Board::GetPcvModule(module), hz);
+            ASSERT_RESULT_OK(rc, "pcvSetClockRate");
+        }
    }
 }

@@ -458,7 +482,7 @@ std::uint32_t Board::GetHz(SysClkModule module)
            hz = 60;
        return hz;
    }
-    
+
    if(HOSSVC_HAS_CLKRST)
    {
        ClkrstSession session = {0};
@@ -753,7 +777,7 @@ std::int32_t Board::GetPowerMw(SysClkPowerSensor sensor)
 }

 std::uint32_t Board::GetPartLoad(SysClkPartLoad loadSource)
-{		
+{
    switch(loadSource)
    {
        case SysClkPartLoad_EMC:
@@ -766,7 +790,7 @@ std::uint32_t Board::GetPartLoad(SysClkPartLoad loadSource)
            return idletick0;
        case HocClkPartLoad_BAT:
            batteryInfoGetChargeInfo(&info);
-            return info.BatteryAge;
+            return info.RawBatteryCharge;
        case HocClkPartLoad_FAN:
            return fanLevel;
        default:
@@ -792,6 +816,7 @@ u8 Board::GetDramID() {
 void Board::FetchHardwareInfos()
 {
    fuseReadSpeedos();
+    SetSpeedoBracket();
    u64 sku = 0, dramID = 0;
    Result rc = splInitialize();
    ASSERT_RESULT_OK(rc, "splInitialize");
@@ -801,7 +826,7 @@ void Board::FetchHardwareInfos()

    rc = splGetConfig(SplConfigItem_DramId, &dramID);
    ASSERT_RESULT_OK(rc, "splGetConfig");
-    
+
    splExit();

    switch(sku)
@@ -816,9 +841,12 @@ void Board::FetchHardwareInfos()
            g_socType = SysClkSocType_Erista;
    }

+    if (g_socType == SysClkSocType_Mariko) {
+        CacheDvfsTable();
+    }
+
    g_consoleType = (HorizonOCConsoleType)sku;
    g_dramID = (u8)dramID;
-
 }

 /*
@@ -926,174 +954,181 @@ std::uint32_t Board::GetVoltage(HocClkVoltage voltage)
    return out > 0 ? out : 0;
 }

-#define MC_REGISTER_BASE 0x70019000
-#define MC_REGISTER_REGION_SIZE 0x1000
+void Board::SetSpeedoBracket() {
+    if (cpuSpeedo2 >= 1754) {
+        speedoBracket = 3;
+    } else if (cpuSpeedo2 >= 1690) {
+        speedoBracket = 2;
+    } else if (cpuSpeedo2 > 1625) {
+        speedoBracket = 1;
+    } else {
+        speedoBracket = 0;
+    }
+}

-#define EMC_REGISTER_BASE 0x7001b000
-#define EMC_REGISTER_REGION_SIZE 0x1000
+u32 Board::GetMinimumGpuVoltage(u32 freqMhz) {
+    if (freqMhz <= 1600)
+        return 0;

-#define GET_CYCLE_CEIL(PARAM) u32(CEIL(double(PARAM) / tCK_avg))
-
-#define WRITE_REGISTER_EMC(TIMING_OFFSET, VALUE)                \
-    do {                                                    \
-        args = {};                                          \
-        args.X[0] = 0xF0000002;                             \
-        args.X[1] = EMC_REGISTER_BASE + (TIMING_OFFSET);    \
-        args.X[2] = 0xFFFFFFFF;                             \
-        args.X[3] = (VALUE);                                \
-        svcCallSecureMonitor(&args);                        \
-    } while (false)
-
-#define WRITE_REGISTER_MC(TIMING_OFFSET, VALUE)                \
-    do {                                                    \
-        args = {};                                          \
-        args.X[0] = 0xF0000002;                             \
-        args.X[1] = MC_REGISTER_BASE + (TIMING_OFFSET);    \
-        args.X[2] = 0xFFFFFFFF;                             \
-        args.X[3] = (VALUE);                                \
-        svcCallSecureMonitor(&args);                        \
-    } while (false)
-
-
-// NOTE: needs patch to exosphere to expose emc region to secmon. MC does NOT need this patch
-
-u32 tRCD_values[]  =  { 18, 17, 16, 15, 14, 13, 12, 11 };
-u32 tRP_values[]   =  { 18, 17, 16, 15, 14, 13, 12, 11 };
-u32 tRAS_values[]  =  { 42, 36, 34, 32, 30, 28, 26, 24, 22, 20 };
-double tRRD_values[]   = { /*10.0,*/ 7.5, 6.0, 5.0, 4.0, 3.0, 2.0, 1.0 }; /* 10.0 is used for <2133mhz; do we care? */
-u32 tRFC_values[]   = { 140, 130, 120, 110, 100, 90, 80, 70, 60, 50, 40 };
-u32 tWTR_values[]   = { 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 };
-u32 tREFpb_values[] = { 3900, 5850, 7800, 11700, 15600, 99999 };
-
-// Credit to Lightos for these timings!
-
-
-void Board::UpdateShadowRegs(u32 tRCD_i, u32 tRP_i, u32 tRAS_i, u32 tRRD_i, u32 tRFC_i, u32 tRTW_i, u32 tWTR_i, u32 tREFpb_i, u32 ramFreq, u32 rlAdd, u32 wlAdd, bool hpMode) {
-    // timing stuff
-
-    SecmonArgs args = {};
-
-    constexpr double MC_ARB_DIV = 4.0;
-    constexpr u32 MC_ARB_SFA = 2;
-
-    double tCK_avg = 1000'000.0 / ramFreq;
-    u32 BL = 16;
-    u32 RL = 28 + rlAdd;
-    u32 WL = 14 + wlAdd;
-    u32 RL_DBI = RL + 4;
-
-    u32 tRCD = tRCD_values[tRCD_i];
-    u32 tRPpb = tRP_values[tRP_i];
-    u32 tRAS = tRAS_values[tRAS_i];
-    double tRRD = tRRD_values[tRRD_i];
-    u32 tRFCpb = tRFC_values[tRFC_i];
-    u32 tWTR = 10 - tWTR_values[tWTR_i];
-    u32 tFAW = static_cast<u32>(tRRD * 4.0);
-
-    double tDQSCK_max = 3.5;
-    u32 tWPRE = 2;
-
-    double tRPST = 0.5;
-
-    u32 tR2W = CEIL(RL_DBI + (tDQSCK_max / tCK_avg) + (BL / 2) - WL + tWPRE + FLOOR(tRPST) + 9.0) - (tRTW_i * 3);
-
-    u32 tRC = tRAS + tRPpb;
-    u32 tRFCab = tRFCpb * 2;
-    u32 tRPab = tRPpb + 3;
-
-    u32 tW2R = CEIL(MAX(WL + (0.010322547033278747 * (ramFreq / 1000.0)), (WL * -0.2067922202979121) + FLOOR(((RL_DBI * -0.1331159971685554) + WL) * 3.654131957826108)) - (tWTR / tCK_avg));
-
-    double tMMRI = tRCD + (tCK_avg * 3);
-    double pdex2mrr = tMMRI + 10;
-    u32 emc_cfg = hpMode ? 0x13200000 : 0xF3200000;
-
-    u32 refresh_raw = 0xFFFF;
-    if (tREFpb_i != 6) {
-        refresh_raw = CEIL(tREFpb_values[tREFpb_i] / tCK_avg) - 0x40;
-        refresh_raw = MIN(refresh_raw, static_cast<u32>(0xFFFF));
+    for (u32 voltageIndex = 0; voltageIndex < 22; ++voltageIndex) {
+        if (freqMhz <= ramBrackets[speedoBracket][voltageIndex]) {
+            return gpuDvfsArray[voltageIndex];
+        }
    }

-    u32 trefbw = refresh_raw + 0x40;
-    trefbw = MIN(trefbw, static_cast<u32>(0x3FFF));
+    return 800;
+}

-    u32 tR2P = 12 + (rlAdd / 2);
-    u32 tW2P = (CEIL(WL * 1.7303) * 2) - 5;
+Handle Board::GetPcvHandle() {
+    constexpr u64 PcvID = 0x10000000000001a;
+    u64 processIDList[80]{};
+    s32 processCount    = 0;
+    Handle handle       = INVALID_HANDLE;

-    double tXSR = (double) (tRFCab + 7.5);
+    DebugEventInfo debugEvent{};

-    args = {};                                         
-    args.X[0] = 0xF0000002;                             
-    args.X[1] = EMC_REGISTER_BASE + EMC_INTSTATUS_0;    
-    svcCallSecureMonitor(&args);                        
+    /* Get all running processes. */
+    Result resultGetProcessList = svcGetProcessList(&processCount, processIDList, std::size(processIDList));
+    if (R_FAILED(resultGetProcessList)) {
+        return INVALID_HANDLE;
+    }

-    if(args.X[1] == (EMC_REGISTER_BASE + EMC_INTSTATUS_0)) { // if param 1 is identical read failed, exosphere needs patch!
-        writeNotification("Horizon OC\nExosphere not patched\nfor EMC r/w"); 
+    /* Try to find pcv. */
+    for (int i = 0; i < processCount; ++i) {
+        if (handle != INVALID_HANDLE) {
+            svcCloseHandle(handle);
+            handle = INVALID_HANDLE;
+        }
+
+        /* Try to debug process, if it fails, try next process. */
+        Result resultSvcDebugProcess = svcDebugActiveProcess(&handle, processIDList[i]);
+        if (R_FAILED(resultSvcDebugProcess)) {
+            continue;
+        }
+
+        /* Try to get a debug event. */
+        Result resultDebugEvent = svcGetDebugEvent(&debugEvent, handle);
+        if (R_SUCCEEDED(resultDebugEvent)) {
+            if (debugEvent.info.create_process.program_id == PcvID) {
+                return handle;
+            }
+        }
+    }
+
+    /* Failed to get handle. */
+    return INVALID_HANDLE;
+}
+
+void Board::CacheDvfsTable() {
+    const u32 voltagePattern[] = { 600000, 12500, 1400000, };
+
+    Handle handle = GetPcvHandle();
+    if (handle == INVALID_HANDLE) {
+        FileUtils::LogLine("[Board] Invalid handle!");
        return;
    }

-    // actually write the timings
-    WRITE_REGISTER_EMC(EMC_CFG_0, emc_cfg);
-    WRITE_REGISTER_EMC(EMC_RD_RCD_0, GET_CYCLE_CEIL(tRCD));
-    WRITE_REGISTER_EMC(EMC_WR_RCD_0, GET_CYCLE_CEIL(tRCD));
-    WRITE_REGISTER_EMC(EMC_RC_0, MIN(GET_CYCLE_CEIL(tRC), static_cast<u32>(0xB8)));
-    WRITE_REGISTER_EMC(EMC_RAS_0, MIN(GET_CYCLE_CEIL(tRAS), static_cast<u32>(0x7F)));
-    WRITE_REGISTER_EMC(EMC_RRD_0, GET_CYCLE_CEIL(tRRD));
-    WRITE_REGISTER_EMC(EMC_RFCPB_0, GET_CYCLE_CEIL(tRFCpb));
-    WRITE_REGISTER_EMC(EMC_RFC_0, GET_CYCLE_CEIL(tRFCab));
-    WRITE_REGISTER_EMC(EMC_RP_0, GET_CYCLE_CEIL(tRPpb));
-    WRITE_REGISTER_EMC(EMC_TRPAB_0, MIN(GET_CYCLE_CEIL(tRPab), static_cast<u32>(0x3F)));
-    WRITE_REGISTER_EMC(EMC_R2W_0, tR2W);
-    WRITE_REGISTER_EMC(EMC_W2R_0, tW2R);
-    WRITE_REGISTER_EMC(EMC_REFRESH_0, refresh_raw);
-    WRITE_REGISTER_EMC(EMC_PRE_REFRESH_REQ_CNT_0, refresh_raw / 4);
-    WRITE_REGISTER_EMC(EMC_TREFBW_0, trefbw);
-    WRITE_REGISTER_EMC(EMC_PDEX2MRR_0, GET_CYCLE_CEIL(pdex2mrr));
-    WRITE_REGISTER_EMC(EMC_TXSR_0, MIN(GET_CYCLE_CEIL(tXSR), static_cast<u32>(0x3fe)));
-    WRITE_REGISTER_EMC(EMC_TXSRDLL_0, MIN(GET_CYCLE_CEIL(tXSR), static_cast<u32>(0x3fe)));
+    MemoryInfo memoryInfo = {};
+    u64 address = 0;
+    u32 pageInfo = 0;
+    constexpr u32 PageSize = 0x1000;
+    u8 buffer[PageSize];

-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RCD_0, CEIL(GET_CYCLE_CEIL(tRCD)   / MC_ARB_DIV) - 2);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RP_0, CEIL(GET_CYCLE_CEIL(tRPpb)  / MC_ARB_DIV) - 1);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RC_0, CEIL(GET_CYCLE_CEIL(tRC)    / MC_ARB_DIV) - 1);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RAS_0, CEIL(GET_CYCLE_CEIL(tRAS)   / MC_ARB_DIV) - 2);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_FAW_0, CEIL(GET_CYCLE_CEIL(tFAW)   / MC_ARB_DIV) - 1);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RRD_0, CEIL(GET_CYCLE_CEIL(tRRD)   / MC_ARB_DIV) - 1);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RFCPB_0, CEIL(GET_CYCLE_CEIL(tRFCpb) / MC_ARB_DIV) - 1);
+    /* Loop until failure. */
+    while (true) {
+        /* Find pcv heap. */
+        while (true) {
+            Result resultProcessMemory = svcQueryDebugProcessMemory(&memoryInfo, &pageInfo, handle, address);
+            address = memoryInfo.addr + memoryInfo.size;

-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_R2W_0, CEIL(tR2W / MC_ARB_DIV) - 1 + MC_ARB_SFA);
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_W2R_0, CEIL(tW2R / MC_ARB_DIV) - 1 + MC_ARB_SFA);
+            if (R_FAILED(resultProcessMemory) || !address) {
+                svcCloseHandle(handle);
+                FileUtils::LogLine("[Board] Failed to get process data. %u", R_DESCRIPTION(resultProcessMemory));
+                handle = INVALID_HANDLE;
+                return;
+            }

-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_RAP2PRE_0, CEIL(tR2P / MC_ARB_DIV));
-    WRITE_REGISTER_MC(MC_EMEM_ARB_TIMING_WAP2PRE_0, CEIL(tW2P / MC_ARB_DIV) + MC_ARB_SFA);
+            if (memoryInfo.size && (memoryInfo.perm & 3) == 3 && static_cast<char>(memoryInfo.type) == 0x04) {
+                /* Found valid memory. */
+                break;
+            }
+        }

-    u32 da_turns = 0;
-    da_turns |= u8((CEIL(tR2W / MC_ARB_DIV) - 1 + MC_ARB_SFA) / 2) << 16;
-    da_turns |= u8((CEIL(tW2R / MC_ARB_DIV) - 1 + MC_ARB_SFA) / 2) << 24;
-    WRITE_REGISTER_MC(MC_EMEM_ARB_DA_TURNS_0, da_turns);
+        for (u64 base = 0; base < memoryInfo.size; base += PageSize) {
+            u32 memorySize = std::min(memoryInfo.size, static_cast<u64>(PageSize));
+            if (R_FAILED(svcReadDebugProcessMemory(buffer, handle, base + memoryInfo.addr, memorySize))) {
+                break;
+            }

-    u32 da_covers = 0;
-    u8 r_cover = ((CEIL(tR2P / MC_ARB_DIV)) + (CEIL(GET_CYCLE_CEIL(tRPpb)  / MC_ARB_DIV) - 1) + (CEIL(GET_CYCLE_CEIL(tRCD)   / MC_ARB_DIV) - 2)) / 2;
-    u8 w_cover = ((CEIL(tW2P / MC_ARB_DIV) + MC_ARB_SFA) + (CEIL(GET_CYCLE_CEIL(tRPpb)  / MC_ARB_DIV) - 1) + (CEIL(GET_CYCLE_CEIL(tRCD)   / MC_ARB_DIV) - 2)) / 2;
-    da_covers |= ((u32)(CEIL(GET_CYCLE_CEIL(tRC) / (u32)MC_ARB_DIV) - 1) / 2);
-    da_covers |= (r_cover << 8);
-    da_covers |= (w_cover << 16);
+            u8 *resultPattern = static_cast<u8 *>(memmem_impl(buffer, sizeof(buffer), voltagePattern, sizeof(voltagePattern)));
+            u32 index = resultPattern - buffer;

-    WRITE_REGISTER_MC(MC_EMEM_ARB_DA_COVERS_0, da_covers);
-    // TODO: modify mc_emem_arb_misc0
-    
-    WRITE_REGISTER_MC(MC_TIMING_CONTROL_0, 0x1); // update timing regs as they are shadowed
-    WRITE_REGISTER_EMC(EMC_TIMING_CONTROL_0, 0x1);
+            if (!resultPattern) {
+                continue;
+            }
+
+            /* Assuming mariko. */
+            const u32 vmax = 800;
+            constexpr u32 DvfsTableOffset = 312;
+            if (!std::memcmp(&buffer[index + DvfsTableOffset], &vmax, sizeof(vmax))) {
+                std::memcpy(dvfsTable, &buffer[index + DvfsTableOffset], sizeof(dvfsTable));
+                dvfsAddress = base + memoryInfo.addr + DvfsTableOffset + index;
+            }
+
+            svcCloseHandle(handle);
+            handle = INVALID_HANDLE;
+            return;
+        }
+    }
+
+    svcCloseHandle(handle);
+    handle = INVALID_HANDLE;
+    return;
 }

+void Board::PcvHijackDvfs(u32 vmin) {
+    u32 table[192];
+    static_assert(sizeof(table) == sizeof(dvfsTable));
+    std::memcpy(table, dvfsTable, sizeof(dvfsTable));
+
+    if (ramVmin == vmin) {
+        return;
+    }
+
+    for (u32 i = 0; i < std::size(table); ++i) {
+        if (table[i] && table[i] <= vmin) {
+            table[i] = vmin;
+        }
+    }
+
+    Handle handle = GetPcvHandle();
+    if (handle == INVALID_HANDLE) {
+        FileUtils::LogLine("Invalid handle!");
+        return;
+    }
+
+    Result rc = svcWriteDebugProcessMemory(handle, table, dvfsAddress, sizeof(table));
+
+    if (R_SUCCEEDED(rc)) {
+        ramVmin = vmin;
+    }
+
+    svcCloseHandle(handle);
+    FileUtils::LogLine("[dvfs] voltage set to %u mV", vmin);
+}
+
+#define MC_REGISTER_BASE 0x70019000
+#define MC_REGISTER_REGION_SIZE 0x1000

 bool Board::IsDram8GB() {
-    SecmonArgs args = {};                                         
-    args.X[0] = 0xF0000002;                             
-    args.X[1] = MC_REGISTER_BASE + MC_EMEM_CFG_0;    
-    svcCallSecureMonitor(&args);                        
+    SecmonArgs args = {};
+    args.X[0] = 0xF0000002;
+    args.X[1] = MC_REGISTER_BASE + MC_EMEM_CFG_0;
+    svcCallSecureMonitor(&args);

    if(args.X[1] == (MC_REGISTER_BASE + MC_EMEM_CFG_0)) { // if param 1 is identical read failed
-        writeNotification("Horizon OC\nSecmon read failed!\n This may be a hardware issue!"); 
+        writeNotification("Horizon OC\nSecmon read failed!\n This may be a hardware issue!");
        return false;
    }  else
        return args.X[1] == 0x00002000 ? true : false;
-}
+}
--- a/Source/sys-clk/sysmodule/src/board.h
+++ b/Source/sys-clk/sysmodule/src/board.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Souldbminer and Horizon OC Contributors
+ * Copyright (c) Souldbminer, Lightos_ and Horizon OC Contributors
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -12,9 +12,9 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
 */
- 
+
 /* --------------------------------------------------------------------------
 * "THE BEER-WARE LICENSE" (Revision 42):
 * <p-sam@d3vs.net>, <natinusala@gmail.com>, <m4x@m4xw.net>
@@ -33,6 +33,8 @@
 class Board
 {
  public:
+    static void PcvHijackDvfs(u32 vmin);
+    static u32 GetMinimumGpuVoltage(u32 freqMhz);
    static void fuseReadSpeedos();
    static u16 getSpeedo(HorizonOCSpeedo speedoType);
    static u16 getIDDQ(HorizonOCSpeedo speedoType);
@@ -61,10 +63,13 @@ class Board
    static std::uint32_t GetVoltage(HocClkVoltage voltage);
    static u8 GetFanRotationLevel();
    static u8 GetDramID();
-    static void UpdateShadowRegs(u32 tRCD_i, u32 tRP_i, u32 tRAS_i, u32 tRRD_i, u32 tRFC_i, u32 tRTW_i, u32 tWTR_i, u32 tREFpb_i, u32 ramFreq, u32 rlAdd, u32 wlAdd, bool hpMode);
    static bool IsDram8GB();
  protected:
    static void FetchHardwareInfos();
    static PcvModule GetPcvModule(SysClkModule sysclkModule);
    static PcvModuleId GetPcvModuleId(SysClkModule sysclkModule);
+  private:
+    static void SetSpeedoBracket();
+    static void CacheDvfsTable();
+    static Handle GetPcvHandle();
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
souldbminersmwc	6e80c9a75f	chore: depricate exosphere patch	2026-02-13 19:53:13 -05:00
souldbminersmwc	42bdfb55f2	remove charge current from overlay	2026-02-13 19:35:40 -05:00
souldbminersmwc	e0967a9fd6	sysclk: fix ui issues	2026-02-13 19:33:42 -05:00
souldbminersmwc	2406ce4f86	sysclk: fix real freq bug	2026-02-13 19:12:01 -05:00
souldbminersmwc	3b40a4a3e5	sysclk: turn on size compiler optimization	2026-02-13 16:36:04 -05:00
souldbminersmwc	38c408dde6	Merge branch 'main' of https://github.com/Horizon-OC/Horizon-OC	2026-02-13 16:33:31 -05:00
souldbminersmwc	5e62eb3f5d	sysclk: fix compile issue and remove 1152 no uv gpu	2026-02-13 16:33:29 -05:00
Lightos1	b4b5599ed2	sleep of 300'000 is enough	2026-02-13 12:15:46 +01:00
souldbminersmwc	b4917f3e1a	sysclk: remove enforce board limit this setting is bugged, so remove it	2026-02-12 19:55:15 -05:00
souldbminersmwc	e6b4cb6612	sysclk: add lineon's cpu volt bugfix thanks, lineon!	2026-02-12 19:49:52 -05:00
souldbminersmwc	b1ca62ce61	sysclk: fix voltage display issue	2026-02-12 19:19:53 -05:00
souldbminersmwc	243f614887	Update clock_manager.cpp	2026-02-12 18:22:43 -05:00
souldbminersmwc	a8577378f6	Update misc_gui.cpp	2026-02-12 17:01:33 -05:00
souldbminersmwc	564703b7c5	sysclk: improve cpu volt bugfix	2026-02-12 17:00:31 -05:00
souldbminersmwc	5ef56bed25	sysclk: remove live timing update and fix profile change dvfs bug	2026-02-12 16:15:25 -05:00
Lightos1	afddb963a9	Remove dvfsOffset capping	2026-02-12 21:22:53 +01:00
Lightos1	aa72176196	Remove budget dvfs	2026-02-12 17:15:26 +01:00
Lightos1	7af0721847	DVFS: Safety check fix	2026-02-12 17:02:52 +01:00
Lightos1	2a6320e646	Bracket fix	2026-02-12 16:49:12 +01:00
Lightos1	fc212bb419	Bump version	2026-02-12 16:46:49 +01:00
Lightos1	14e0053335	DVFS: Add offset	2026-02-12 16:44:04 +01:00
Lightos1	8f28daceef	DVFS: Add safety check	2026-02-12 16:12:36 +01:00
souldbminersmwc	f1044673d0	sysclk: modify dvfs logic	2026-02-11 19:28:43 -05:00
souldbminersmwc	61a0ebffee	sysclk: fully fix dvfs	2026-02-11 19:22:25 -05:00
souldbminersmwc	8de8f4013e	sysclk: fix dvfs config option	2026-02-11 19:11:02 -05:00
souldbminersmwc	dd447553d4	sysclk: make dvfs work	2026-02-11 19:09:55 -05:00
Lightos1	11c456e00c	Fix random }	2026-02-11 17:42:10 +01:00
Lightos1	5efb4bdd6b	Add hijack dvfs from sys-clk-eos	2026-02-11 16:57:26 +01:00
Lightos1	e331f1249b	Why did this not commit?	2026-02-11 11:08:29 +01:00
Lightos1	786467d7ea	add r2w fine tuning	2026-02-11 11:05:45 +01:00
Lightos1	496e77301b	bump version	2026-02-11 01:06:52 +01:00
Lightos1	d657f1d156	Fix typo 2	2026-02-10 15:33:47 +01:00
Lightos1	7ab5c2f540	Fix typo	2026-02-10 15:33:03 +01:00
Lightos1	71900721cf	Make AUTO_RAM default (for now)	2026-02-10 15:26:12 +01:00
Lightos1	0bc9547701	Add advanced header	2026-02-10 15:12:17 +01:00
Lightos1	96ac254022	Add w2r fine tune	2026-02-10 15:04:28 +01:00
Souldbminer	92f378a80f	fix svfs again	2026-02-09 18:59:09 -05:00
Lightos1	589af01ad8	Budget dvfs fix	2026-02-10 00:39:22 +01:00
Lightos1	e7f14b88e5	Replace floor with ceil	2026-02-09 16:29:05 +01:00
souldbminersmwc	35a269e4a7	Update README.md	2026-02-08 15:51:46 -05:00
souldbminersmwc	ff95ca527f	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-02-08 15:33:53 -05:00
souldbminersmwc	550e4e5204	Delete HOC_AUTO_RAM_TEST.zip	2026-02-08 15:33:39 -05:00
Lightos1	a088c4795a	Update readme	2026-02-08 18:52:23 +01:00
Lightos1	e8a264fa11	New timings, fix budget gpu dvfs	2026-02-08 18:46:10 +01:00
souldbminersmwc	de681c20a0	ldr: code cleanup	2026-02-08 12:00:27 -05:00
souldbminersmwc	22aef264ab	Update pcv_mariko.cpp	2026-02-08 11:57:54 -05:00
souldbminersmwc	309717c468	ldr: fix auto_ram vmin	2026-02-08 11:57:43 -05:00
souldbminersmwc	9b91d7487c	ldr: rename namespace	2026-02-08 11:56:04 -05:00
souldbminersmwc	c0b458243c	ldr: add auto ram vmin	2026-02-08 11:54:21 -05:00
souldbminersmwc	7d9c60cdfe	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-02-07 19:20:33 -05:00
souldbminersmwc	12c9effec2	Update README.md	2026-02-07 19:20:31 -05:00
Souldbminer	6eeab63075	Rearrange CPU clock entries in README Reordered CPU clock entries for clarity.	2026-02-07 18:53:41 -05:00
Souldbminer	2d81c5e127	Merge pull request #34 from OEMunlag/develop Remove dist.zip hash on actions	2026-02-07 18:51:12 -05:00
souldbminersmwc	b1739cea74	sysclk: rework clock capping	2026-02-07 18:38:37 -05:00
souldbminersmwc	aa607ab1a7	sysclk: safety display changes	2026-02-07 18:28:49 -05:00
souldbminersmwc	d1242a17d4	sysclk: 2133MHz is a JEDEC clock	2026-02-07 18:23:49 -05:00
2fort sink	80701c2891	Merge branch 'Horizon-OC:develop' into develop	2026-02-07 20:18:15 -03:00
souldbminersmwc	cfd0d84ac8	update dist	2026-02-07 18:10:21 -05:00
souldbminersmwc	c33aabdc84	chore: code cleanup	2026-02-07 18:10:12 -05:00
2fort sink	c70fd82e60	Modify build.yml to set commit SHA and dist Updated the GitHub Actions workflow to include a distribution file with the commit SHA.	2026-02-07 20:07:56 -03:00
2fort sink	574c248d68	Merge branch 'Horizon-OC:develop' into develop	2026-02-07 19:55:21 -03:00
souldbminersmwc	ebcf07dab8	update files	2026-02-07 17:51:38 -05:00
souldbminersmwc	d170ca92ad	ldr: rework reserved entries	2026-02-07 17:51:18 -05:00
souldbminersmwc	cab8a14b99	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-02-06 19:43:48 -05:00
souldbminersmwc	b623dabce5	sysclk: fix 1963mhz bug	2026-02-06 19:42:58 -05:00
Dominator	e5eb49f2e5	Merge pull request #33 from Blaise-25/develop	2026-02-06 01:47:22 +02:00
Blaise-25	9f0a609735	Update README.md	2026-02-05 15:20:12 -08:00
Souldbminer	19a2e562bc	Update README.md	2026-02-05 16:12:30 -05:00
souldbminersmwc	73c3311251	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-02-04 19:33:30 -05:00
souldbminersmwc	eb7fca1c1a	erista ram overclock support + reserved entried if you use hoc-clk 0.33 and want to update follow these steps go to config/horizon-oc/config.ini remove these two entries: crc32=xxxxxxxxxxx is_first_load=0	2026-02-04 19:33:10 -05:00
Dominator	ad1f070a6b	Update README.md	2026-02-05 01:17:10 +02:00
2fort sink	0ae65c8740	Merge branch 'Horizon-OC:develop' into develop	2026-02-04 18:07:27 -03:00
2fort sink	39fbe25afc	Update build.yml	2026-02-04 18:07:16 -03:00
souldbminersmwc	3bad144280	sysclk: add cat script	2026-02-03 19:01:49 -05:00
souldbminersmwc	123d4b6080	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-02-03 18:57:02 -05:00
souldbminersmwc	2f6ed69b92	sysclk: refine misc gui	2026-02-03 18:56:48 -05:00
Souldbminer	337f7e6ac0	Merge pull request #32 from OEMunlag/develop proper github actions build	2026-02-03 15:57:29 -05:00
2fort sink	a5efa7ae72	Add files via upload	2026-02-03 16:55:48 -03:00
2fort sink	a8ee389681	Revert to last working Updated the Docker image for the build container and removed unnecessary steps for creating compiler shims. Added packaging of the dist folder as a ZIP file with the commit SHA.	2026-02-03 16:40:38 -03:00
2fort sink	54554bacea	Change Docker image and install switch-dev Updated the Docker image for the build container and added a step to install switch-dev.	2026-02-03 16:28:09 -03:00
2fort sink	3da2fc4b6d	Merge branch 'Horizon-OC:develop' into develop	2026-02-03 15:05:11 -03:00
2fort sink	83287b1f5c	Update build.yml	2026-02-02 21:53:24 -03:00
2fort sink	4f6756c609	Update build.yml	2026-02-02 21:29:05 -03:00
souldbminersmwc	ef2434c457	try to fix status monitor issues	2026-02-02 19:13:08 -05:00
2fort sink	b0237a2042	Update build.yml	2026-02-02 21:07:54 -03:00
2fort sink	c6275eb977	Update build.yml	2026-02-02 20:51:49 -03:00
2fort sink	72961aa2f1	Update build.yml	2026-02-02 20:46:58 -03:00
2fort sink	9c60697344	Merge branch 'Horizon-OC:develop' into develop	2026-02-02 20:45:15 -03:00
2fort sink	f786d97de1	Update build.yml	2026-02-02 20:44:06 -03:00
2fort sink	20389043ac	Enhance build.yml with ccache shims for compilers very hacky I know but we also fix exosphere hopefully with this	2026-02-02 20:37:56 -03:00
souldbminersmwc	00b9d8550e	ldr: fix erista cpu validator this DOES NOT fix erista cpu uv, but is probably part of the issue	2026-02-02 18:18:22 -05:00
2fort sink	0c0a4b3d6b	Merge branch 'Horizon-OC:develop' into develop	2026-02-01 19:14:07 -03:00
2fort sink	61fd9d74d3	Update build.yml	2026-02-01 19:14:00 -03:00
2fort sink	f36383d0e7	Update build.yml	2026-02-01 18:58:52 -03:00
souldbminersmwc	606cafbaad	sysclk: rework TDP	2026-02-01 16:33:15 -05:00
2fort sink	cff4267a68	Fix ROOT variable assignment in build workflow	2026-02-01 18:32:01 -03:00
2fort sink	65e7d83972	Update build.yml	2026-02-01 18:26:30 -03:00
2fort sink	e2533e2bb0	Patch exosphere and build, fix comment and zip making redundancy	2026-02-01 18:19:23 -03:00
souldbminersmwc	0d4ca24538	sysclk: add kip auto update feature	2026-02-01 16:15:08 -05:00
2fort sink	6c94f5754c	Update build.yml	2026-02-01 17:58:52 -03:00
2fort sink	aaf77997e1	Update build.yml	2026-02-01 17:52:44 -03:00
2fort sink	c933e02aed	Merge branch 'Horizon-OC:develop' into develop	2026-02-01 17:46:47 -03:00
2fort sink	770c25dbcb	build hoc-clk and shallow clone ams Updated the build process to use shallow clones and added a new build step for the hoc-clk sysmodule and overlay.	2026-02-01 17:44:20 -03:00
souldbminersmwc	bf8a6c4785	sysclk: fix uv3 cappings	2026-02-01 15:27:17 -05:00
2fort sink	dbb4d698a0	Increase make parallel jobs and update file paths	2026-02-01 16:12:26 -03:00
2fort sink	6ae084433f	Update build.yml	2026-02-01 15:58:29 -03:00
2fort sink	32f19c4f0e	Update build.yml	2026-02-01 15:48:47 -03:00
2fort sink	05cf2ab4dd	Clone Atmosphere with specific branch from file	2026-02-01 14:28:37 -03:00
2fort sink	13a4ea4ca0	create ams_ver.txt Should be self-explanatory, we use this for the actions build system	2026-02-01 14:27:02 -03:00
2fort sink	e2ef52e095	Update build.yml	2026-02-01 14:25:15 -03:00
2fort sink	bbd3b1a0fc	Refactor build.yml for environment setup and ccache Updated the build workflow to set environment variables using GitHub Actions environment files and improved the ccache installation step.	2026-02-01 14:22:31 -03:00
2fort sink	8dcfb55646	retry cache and actions cache	2026-02-01 14:15:59 -03:00
2fort sink	ae0f4c7963	Delete .github/workflows/build.yml	2026-02-01 13:54:21 -03:00
2fort sink	222db76200	refactor this test testing woo waa waewewe waowowoewewahaaswadisadasud Updated comments and modified build steps in the GitHub Actions workflow.	2026-02-01 13:52:55 -03:00
souldbminersmwc	2376b85d3a	remove build action way too slow to be practical	2026-01-31 18:52:23 -05:00
souldbminersmwc	26fb76e448	Update build.yml	2026-01-31 18:42:54 -05:00
souldbminersmwc	159c7567c0	Update build.yml	2026-01-31 18:41:42 -05:00
souldbminersmwc	39366ce238	Update build.yml	2026-01-31 18:40:33 -05:00
souldbminersmwc	da631ad268	Create build.yml	2026-01-31 18:37:47 -05:00
souldbminersmwc	d508177d4b	Delete build.yml	2026-01-31 17:31:47 -05:00
souldbminersmwc	d8527410de	Update build.yml	2026-01-31 17:30:17 -05:00
souldbminersmwc	bae7216de0	Update build.yml	2026-01-31 17:29:34 -05:00
souldbminersmwc	b3ddf172e8	Update build.yml	2026-01-31 17:28:25 -05:00
souldbminersmwc	cdaea8f729	fix build script	2026-01-31 17:27:18 -05:00
souldbminersmwc	918ca5757c	chore: add build script	2026-01-31 17:25:30 -05:00
souldbminersmwc	93cb0e99c4	build: remove broken build script	2026-01-31 17:20:06 -05:00
souldbminersmwc	4692529346	chore: clean up repo	2026-01-31 17:19:33 -05:00
souldbminersmwc	8de1191ed5	sysclk: rename ipc service	2026-01-31 17:15:06 -05:00
souldbminersmwc	1c21187f73	sysclk: remove unused stuff	2026-01-31 17:12:50 -05:00
souldbminersmwc	2646995b72	sysclk: rework clock capping	2026-01-30 19:44:12 -05:00
souldbminersmwc	cf21342b2e	Update pcv_erista.cpp	2026-01-28 15:45:45 -05:00
souldbminersmwc	3709fb3fba	ldr: fix default gpu vmin	2026-01-28 15:41:50 -05:00
souldbminersmwc	ea754707ee	sysclk: fix erista gpu vmin	2026-01-28 15:39:56 -05:00
souldbminersmwc	bb96267d6c	Adjust license	2026-01-26 19:30:18 -05:00
souldbminersmwc	a1fa16da3c	misc changes	2026-01-26 19:29:45 -05:00
souldbminersmwc	aad126d611	rename uv table	2026-01-26 19:26:30 -05:00
souldbminersmwc	835189febc	update	2026-01-26 19:23:28 -05:00
souldbminersmwc	a9cf59fe28	ldr: UV3 doesn't exist anymore	2026-01-26 19:08:27 -05:00
souldbminersmwc	7708e4bae6	Update pcv.cpp	2026-01-26 19:07:52 -05:00
souldbminersmwc	8c71227c63	sysclk: improve cpu fix	2026-01-26 16:41:35 -05:00
souldbminersmwc	627732326b	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-01-26 16:26:09 -05:00
souldbminersmwc	f5d9761853	fix cpu bug	2026-01-26 16:25:25 -05:00
Lightos1	1d219e9425	Extend vdd2 validators	2026-01-25 13:07:13 +01:00
Lightos1	2c14ddad5c	Extend vddq validator	2026-01-25 11:41:05 +01:00
souldbminersmwc	fee7e7a4f4	Merge branch 'develop' of https://github.com/Horizon-OC/Horizon-OC into develop	2026-01-24 18:54:58 -05:00
souldbminersmwc	caeee5920b	sysclk: fix cpu boost clock	2026-01-24 18:54:56 -05:00
Lightos1	71fbeef32a	Revert "Update ptm.cpp", worked before This reverts commit `86fce20b27`.	2026-01-24 22:14:19 +01:00
souldbminersmwc	86fce20b27	Update ptm.cpp	2026-01-24 15:17:50 -05:00