diff --git a/courses/koopa_troopa_beach/course_offsets.c b/courses/koopa_troopa_beach/course_offsets.c
index 45c5d010d..7e532e7bc 100644
--- a/courses/koopa_troopa_beach/course_offsets.c
+++ b/courses/koopa_troopa_beach/course_offsets.c
@@ -241,73 +241,63 @@ Animation d_course_koopa_troopa_beach_unk_data4 = {
 
 //! 0x60169b
 uintptr_t d_course_koopa_troopa_beach_unk4[] = {
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_ADD_POS(0x00000000, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_16630,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_koopa_troopa_beach_dl_16630),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0xfffffffb, 0x00000005,
+    ANIMATION_ADD_POS(0x00000000, -0x00000005, 0x00000005),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_16850,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_koopa_troopa_beach_dl_16850),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_168F0,
-    0x00000024, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_168F0, 0x00000024, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_16990,
-    0x00000019, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_16990, 0x00000019, 0x00000000, 0x00000000),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0xfffffffb, 0xfffffffb,
+    ANIMATION_ADD_POS(0x00000000, -0x00000005, -0x00000005),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_16850,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_koopa_troopa_beach_dl_16850),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_168F0,
-    0x00000024, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_168F0, 0x00000024, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_koopa_troopa_beach_dl_16990,
-    0x00000019, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_koopa_troopa_beach_dl_16990, 0x00000019, 0x00000000, 0x00000000),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000003, 0x00000002,
+    ANIMATION_STOP,
 };
 
 // 0x06016B60
diff --git a/courses/rainbow_road/course_offsets.c b/courses/rainbow_road/course_offsets.c
index d17ac3b7c..f7a6d8da5 100644
--- a/courses/rainbow_road/course_offsets.c
+++ b/courses/rainbow_road/course_offsets.c
@@ -100,40 +100,33 @@ Animation* d_rainbow_road_unk3[] = {
 
 // 0x06016110
 uintptr_t d_rainbow_road_unk4[] = {
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0x0000023a, 0x00000000,
+    ANIMATION_ADD_POS(0x00000000, 0x0000023a, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_rainbow_road_dl_15550,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_15550),
 
-    0x00000000, 0x00000007, 0x00000000, d_course_rainbow_road_dl_151A8,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_151A8),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0x0000023a, 0x00000000,
+    ANIMATION_ADD_POS(0x00000000, 0x0000023a, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_rainbow_road_dl_15C68,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_15C68),
 
-    0x00000000, 0x00000007, 0x00000000, d_course_rainbow_road_dl_158C0,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_158C0),
 
-    0x00000000, 0x00000007, 0x00000000, d_course_rainbow_road_dl_15F18,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_rainbow_road_dl_15F18),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000003, 0x00000002,
+    ANIMATION_STOP,
 };
 
 // No idea what this stuff is
diff --git a/courses/sherbet_land/course_offsets.c b/courses/sherbet_land/course_offsets.c
index 0ed86ad8d..a4a5ccac3 100644
--- a/courses/sherbet_land/course_offsets.c
+++ b/courses/sherbet_land/course_offsets.c
@@ -66,68 +66,57 @@ const Gfx* sherbet_land_dls_2[] = {
 };
 
 uintptr_t d_course_sherbet_land_unk_data1[] = {
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_sherbet_land_dl_8D00,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_sherbet_land_dl_8D00),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0xFFFFFFCD, 0x00000054, 0xFFFFFFF3,
+    ANIMATION_ADD_POS(-0x00000033, 0x00000054, -0x0000000d),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_sherbet_land_dl_8730,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_sherbet_land_dl_8730),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000033, 0x00000054, 0xFFFFFFF3,
+    ANIMATION_ADD_POS(0x00000033, 0x00000054, -0x0000000d),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_sherbet_land_dl_8808,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_sherbet_land_dl_8808),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0xFFFFFFDA, 0xFFFFFFCA, 0xFFFFFFF3,
+    ANIMATION_ADD_POS(-0x00000026, -0x00000036, -0x0000000d),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_sherbet_land_dl_8930,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_sherbet_land_dl_8930),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000026, 0xFFFFFFCA, 0xFFFFFFF3,
+    ANIMATION_ADD_POS(0x00000026, -0x00000036, -0x0000000d),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_sherbet_land_dl_8A78,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_sherbet_land_dl_8A78),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0x0000006F, 0xFFFFFFED,
+    ANIMATION_ADD_POS(0x00000000, 0x0000006F, -0x00000013),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_sherbet_land_dl_8E00,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_sherbet_land_dl_8E00),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000003, 0x00000002,
+    ANIMATION_STOP,
 };
 
 // 0x0600905C
diff --git a/courses/yoshi_valley/course_offsets.c b/courses/yoshi_valley/course_offsets.c
index 959c2dcc4..7518ece5d 100644
--- a/courses/yoshi_valley/course_offsets.c
+++ b/courses/yoshi_valley/course_offsets.c
@@ -159,63 +159,55 @@ Animation* d_course_yoshi_valley_unk4[] = {
 
 //! 0x06014798
 uintptr_t d_course_yoshi_valley_unk5[] = {
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_ADD_POS(0x00000000, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_yoshi_valley_dl_142C0,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_yoshi_valley_dl_142C0),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, 0x00000000,
-    0x000007f8, 0x00000000, 0x00000000,
+    ANIMATION_ADD_POS(0x000007f8, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_yoshi_valley_dl_143C8,
-    0x00000000, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL(d_course_yoshi_valley_dl_143C8),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_yoshi_valley_dl_144A8,
-    0x000001cc, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_yoshi_valley_dl_144A8, 0x000001cc, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_yoshi_valley_dl_14500,
-    0x000001cc, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_yoshi_valley_dl_14500, 0x000001cc, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_yoshi_valley_dl_14558,
-    0x00000158, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_yoshi_valley_dl_14558, 0x00000158, 0x00000000, 0x00000000),
 
-    0x00000001, 0x00000002,
+    ANIMATION_DISABLE_AUTOMATIC_POP,
 
-    0x00000000, 0x00000007, 0x00000000, d_course_yoshi_valley_dl_145D0,
-    0x00000120, 0x00000000, 0x00000000,
+    ANIMATION_RENDER_MODEL_AT(d_course_yoshi_valley_dl_145D0, 0x00000120, 0x00000000, 0x00000000),
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000002, 0x00000002,
+    ANIMATION_POP_MATRIX,
 
-    0x00000003, 0x00000002,
+    ANIMATION_STOP,
 };
 
 // No idea what this stuff is
diff --git a/libultraship b/libultraship
index da9e33418..736ad6825 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit da9e334188169ec95cc1af3468dda7146df49928
+Subproject commit 736ad68251e49c24a8f11bb3499d3467a7ab6705
diff --git a/src/menus.c b/src/menus.c
index dffd6c47b..c65bcfb5b 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -1382,12 +1382,12 @@ void main_menu_act(struct Controller* controller, u16 arg1) {
                 if (btnAndStick & D_JPAD) {
                     sp24 = false;
                     if (func_800B555C()) {
-                        if (sp28 < gGameModePlayerColumnExtra[gPlayerCount - 1][D_800E86AC[gPlayerCount - 1] + 1]) {
+                        if (sp28 < gGameModePlayerColumnExtra[gPlayerCount - 1][D_800E86AC[gPlayerCount - 1]]) {
                             sp24 = true;
                         }
                     } else {
                         // L800B30D4
-                        if (sp28 < gGameModePlayerColumnDefault[gPlayerCount - 1][D_800E86AC[gPlayerCount - 1] + 1]) {
+                        if (sp28 < gGameModePlayerColumnDefault[gPlayerCount - 1][D_800E86AC[gPlayerCount - 1]]) {
                             sp24 = true;
                         }
                     }
diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp
index ed4575767..358263f7e 100644
--- a/src/port/ui/ImguiUI.cpp
+++ b/src/port/ui/ImguiUI.cpp
@@ -297,7 +297,7 @@ void DrawSettingsMenu() {
                 currentFps = 60;
             }
             CVarSetInteger("gInterpolationFPS", currentFps);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
 #else
             bool matchingRefreshRate =
                 CVarGetInteger("gMatchRefreshRate", 0) &&
@@ -326,7 +326,7 @@ void DrawSettingsMenu() {
                 int hz = Ship::Context::GetInstance()->GetWindow()->GetCurrentRefreshRate();
                 if (hz >= 30 && hz <= 360) {
                     CVarSetInteger("gInterpolationFPS", hz);
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                 }
             }
         } else {
diff --git a/src/port/ui/UIWidgets.cpp b/src/port/ui/UIWidgets.cpp
index f1e3badca..b97256765 100644
--- a/src/port/ui/UIWidgets.cpp
+++ b/src/port/ui/UIWidgets.cpp
@@ -216,7 +216,7 @@ bool EnhancementCheckbox(const char* text, const char* cvarName, bool disabled,
     bool val = (bool) CVarGetInteger(cvarName, defaultValue);
     if (CustomCheckbox(text, &val, disabled, disabledGraphic)) {
         CVarSetInteger(cvarName, val);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         changed = true;
     }
 
@@ -260,7 +260,7 @@ bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynam
                     CVarSetInteger(cvarName, i);
                     selected = i;
                     changed = true;
-                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
                 }
             }
         }
@@ -273,7 +273,7 @@ bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynam
         if (disabledValue >= 0 && selected != disabledValue) {
             CVarSetInteger(cvarName, disabledValue);
             changed = true;
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         }
     }
 
@@ -369,7 +369,7 @@ bool EnhancementSliderInt(const char* text, const char* id, const char* cvarName
 
     if (changed) {
         CVarSetInteger(cvarName, val);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
 
     return changed;
@@ -448,7 +448,7 @@ bool EnhancementSliderFloat(const char* text, const char* id, const char* cvarNa
 
     if (changed) {
         CVarSetFloat(cvarName, val);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
     }
 
     return changed;
@@ -505,7 +505,7 @@ bool EnhancementRadioButton(const char* text, const char* cvarName, int id) {
     int val = CVarGetInteger(cvarName, 0);
     if (ImGui::RadioButton(make_invisible.c_str(), id == val)) {
         CVarSetInteger(cvarName, id);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         ret = true;
     }
     ImGui::SameLine();
@@ -532,7 +532,7 @@ bool DrawResetColorButton(const char* cvarName, ImVec4* colors, ImVec4 defaultco
 
         CVarSetColor(cvarName, colorsRGBA);
         CVarSetInteger(Cvar_RBM.c_str(), 0); // On click disable rainbow mode.
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         changed = true;
     }
     Tooltip("Revert colors to the game's original colors (GameCube version)\nOverwrites previously chosen color");
@@ -805,7 +805,7 @@ bool CVarCheckbox(const char* label, const char* cvarName, const CheckboxOptions
     bool value = (bool) CVarGetInteger(cvarName, options.defaultValue);
     if (Checkbox(label, &value, options)) {
         CVarSetInteger(cvarName, value);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         dirty = true;
     }
     return dirty;
@@ -914,7 +914,7 @@ bool CVarCombobox(const char* label, const char* cvarName, std::span<const char*
     uint8_t value = (uint8_t) CVarGetInteger(cvarName, options.defaultIndex);
     if (Combobox(label, &value, comboArray, options)) {
         CVarSetInteger(cvarName, value);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         dirty = true;
     }
     return dirty;
@@ -962,7 +962,7 @@ bool SliderInt(const char* label, int32_t* value, int32_t min, int32_t max, cons
             *value -= options.step;
             if (*value < min)
                 *value = min;
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             dirty = true;
         }
         ImGui::SameLine(0, 3.0f);
@@ -971,7 +971,7 @@ bool SliderInt(const char* label, int32_t* value, int32_t min, int32_t max, cons
         ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
     }
     if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_S32, value, &min, &max, options.format, options.flags)) {
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         dirty = true;
     }
     if (options.showButtons) {
@@ -981,7 +981,7 @@ bool SliderInt(const char* label, int32_t* value, int32_t min, int32_t max, cons
             *value += options.step;
             if (*value > max)
                 *value = max;
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             dirty = true;
         }
     }
@@ -1004,7 +1004,7 @@ bool CVarSliderInt(const char* label, const char* cvarName, int32_t min, int32_t
     int32_t value = CVarGetInteger(cvarName, defaultValue);
     if (SliderInt(label, &value, min, max, options)) {
         CVarSetInteger(cvarName, value);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         dirty = true;
     }
     return dirty;
@@ -1037,7 +1037,7 @@ bool SliderFloat(const char* label, float* value, float min, float max, const Fl
             *value -= options.step;
             if (*value < min)
                 *value = min;
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             dirty = true;
         }
         ImGui::SameLine(0, 3.0f);
@@ -1048,7 +1048,7 @@ bool SliderFloat(const char* label, float* value, float min, float max, const Fl
     if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_Float, &valueToDisplay, &minToDisplay, &maxToDisplay,
                             options.format, options.flags)) {
         *value = options.isPercentage ? valueToDisplay / 100.0f : valueToDisplay;
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         dirty = true;
     }
     if (options.showButtons) {
@@ -1058,7 +1058,7 @@ bool SliderFloat(const char* label, float* value, float min, float max, const Fl
             *value += options.step;
             if (*value > max)
                 *value = max;
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
             dirty = true;
         }
     }
@@ -1081,7 +1081,7 @@ bool CVarSliderFloat(const char* label, const char* cvarName, float min, float m
     float value = CVarGetFloat(cvarName, defaultValue);
     if (SliderFloat(label, &value, min, max, options)) {
         CVarSetFloat(cvarName, value);
-        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
         dirty = true;
     }
     return dirty;
diff --git a/torch b/torch
index b9560339d..6edf65bec 160000
--- a/torch
+++ b/torch
@@ -1 +1 @@
-Subproject commit b9560339d3aae8739ed237c8418acb444fdfe67b
+Subproject commit 6edf65beca37954d6d2243c92875a1dc84b6b3f6