diff --git a/Source/hoc-clk/build.sh b/Source/hoc-clk/build.sh
index 8ad2c457..ef12ae5a 100644
--- a/Source/hoc-clk/build.sh
+++ b/Source/hoc-clk/build.sh
@@ -20,7 +20,7 @@ make -j$CORES
 popd > /dev/null
 
 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"
+cp -vf "$ROOT_DIR/sysmodule/out/hoc-clk.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"
 
diff --git a/Source/hoc-clk/overlay/Makefile b/Source/hoc-clk/overlay/Makefile
index 09339ff1..ad7d6014 100644
--- a/Source/hoc-clk/overlay/Makefile
+++ b/Source/hoc-clk/overlay/Makefile
@@ -64,7 +64,7 @@ CFLAGS += -DUI_OVERRIDE_PATH="\"$(UI_OVERRIDE_PATH)\""
 #CFLAGS += -DNO_FSTREAM_DIRECTIVE=$(NO_FSTREAM_DIRECTIVE)
 
 
-CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=gnu++20
+CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=gnu++23
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
diff --git a/Source/hoc-clk/sysmodule/Makefile b/Source/hoc-clk/sysmodule/Makefile
index 80f7495b..ced6b81a 100644
--- a/Source/hoc-clk/sysmodule/Makefile
+++ b/Source/hoc-clk/sysmodule/Makefile
@@ -17,7 +17,8 @@ include $(DEVKITPRO)/libnx/switch_rules
 # INCLUDES is a list of directories containing header files
 # EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm".
 #---------------------------------------------------------------------------------
-TARGET		:=	horizon-oc
+TARGET		:=	hoc-clk
+CONFIG_DIR	:=	horizon-oc
 BUILD		:=	build
 OUTDIR		:=	out
 RESOURCES	:=	res
@@ -35,7 +36,7 @@ TARGET_VERSION	:= $(shell git describe --dirty --always --tags)
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-DEFINES	:=	-DDISABLE_IPC -DTARGET="\"$(TARGET)\"" -DTARGET_VERSION="\"$(TARGET_VERSION)\""
+DEFINES	:=	-DDISABLE_IPC -DTARGET="\"$(TARGET)\"" -DTARGET_VERSION="\"$(TARGET_VERSION)\"" -DCONFIG_DIR="\"$(CONFIG_DIR)\""
 
 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 
@@ -44,7 +45,7 @@ CFLAGS	:=	-g -Wall -Os -ffunction-sections \
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__
 
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -std=gnu++17
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -std=gnu++23
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
diff --git a/Source/hoc-clk/sysmodule/src/config.cpp b/Source/hoc-clk/sysmodule/src/config.cpp
index 1beabd9e..7de0fdd4 100644
--- a/Source/hoc-clk/sysmodule/src/config.cpp
+++ b/Source/hoc-clk/sysmodule/src/config.cpp
@@ -257,8 +257,8 @@ namespace config {
 
         std::vector<std::string> keys;
         std::vector<std::string> values;
-        keys.reserve(HocClkProfile_EnumMax * HocClkModule_EnumMax);
-        values.reserve(HocClkProfile_EnumMax * HocClkModule_EnumMax);
+        keys.reserve(+HocClkProfile_EnumMax * +HocClkModule_EnumMax);
+        values.reserve(+HocClkProfile_EnumMax * +HocClkModule_EnumMax);
 
         std::uint32_t* mhz = &profiles->mhz[0];
 
diff --git a/Source/hoc-clk/sysmodule/src/file_utils.hpp b/Source/hoc-clk/sysmodule/src/file_utils.hpp
index 902a40b1..d00bd8f5 100644
--- a/Source/hoc-clk/sysmodule/src/file_utils.hpp
+++ b/Source/hoc-clk/sysmodule/src/file_utils.hpp
@@ -34,7 +34,7 @@
 #include <cstdarg>
 #include <hocclk.h>
 
-#define FILE_CONFIG_DIR "/config/" TARGET
+#define FILE_CONFIG_DIR "/config/" CONFIG_DIR
 #define FILE_FLAG_CHECK_INTERVAL_NS (10000ULL * 1000000000ULL)
 #define FILE_CONTEXT_CSV_PATH FILE_CONFIG_DIR "/context.csv"
 #define FILE_LOG_FLAG_PATH FILE_CONFIG_DIR "/log.flag"
diff --git a/Source/hoc-clk/sysmodule/src/integrations.cpp b/Source/hoc-clk/sysmodule/src/integrations.cpp
index 9c74eaab..a97cee82 100644
--- a/Source/hoc-clk/sysmodule/src/integrations.cpp
+++ b/Source/hoc-clk/sysmodule/src/integrations.cpp
@@ -88,7 +88,7 @@ namespace integrations {
 
     bool GetRETROSuperStatus() {
         struct stat st = {0};
-        return stat("sdmc:/config/horizon-oc/retro.flag", &st) == 0;
+        return stat("sdmc:/config/horizon-oc/retro.flag", &st) == 0; // TODO: unhardcode this
     }
 
     void LoadSaltyNX() {