diff --git a/CMake/lus-cvars.cmake b/CMake/lus-cvars.cmake
index 7582cfa33..ac4a6adea 100644
--- a/CMake/lus-cvars.cmake
+++ b/CMake/lus-cvars.cmake
@@ -1,5 +1,6 @@
 set(CVAR_VSYNC_ENABLED "${CVAR_PREFIX_SETTING}.VsyncEnabled" CACHE STRING "")
 set(CVAR_Z_FIGHTING_MODE "${CVAR_PREFIX_SETTING}.ZFightingMode" CACHE STRING "")
+set(CVAR_DISABLE_CLOSE_COLOR_WRAP "${CVAR_PREFIX_SETTING}.DisableCloseColorWrap" CACHE STRING "")
 set(CVAR_NEW_FILE_DROPPED "${CVAR_PREFIX_GENERAL}.NewFileDropped" CACHE STRING "")
 set(CVAR_DROPPED_FILE "${CVAR_PREFIX_GENERAL}.DroppedFile" CACHE STRING "")
 set(CVAR_INTERNAL_RESOLUTION "${CVAR_PREFIX_SETTING}.InternalResolution" CACHE STRING "")
diff --git a/libultraship b/libultraship
index 6bbc13433..6b8a8d8fb 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 6bbc13433a3a702f8c67a56bd11606e986099ffc
+Subproject commit 6b8a8d8fb1d4f680f6fe2263ddef32b94aa429f8
diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp
index e6b48ed34..2bff9ff38 100644
--- a/mm/2s2h/BenPort.cpp
+++ b/mm/2s2h/BenPort.cpp
@@ -502,6 +502,9 @@ extern "C" void InitOTR() {
         CVarClear("gLetItSnow");
     }
 
+    // BENTODO Once we have a proper fix for the color cominber, remove this
+    CVarRegisterInteger(CVAR_DISABLE_CLOSE_COLOR_WRAP, 1);
+
     srand(now);
 #ifdef ENABLE_CROWD_CONTROL
     CrowdControl::Instance = new CrowdControl();