Update decomp clang (#67)

* Update menus.c (#634)

* Update common_data.yml (#635)

* Renames for screenId and other changes (#636)

* screenId renames

* Rename surface map to collision mesh (#637)

* Rename some stack vars (#638)

* Fix syntax error (#639)

* Rename some stack vars

* Update collision.c

* Collision Documentation (#640)

* Collision related renames

* update doxygen (#649)

* change bool (#644)

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>

* Update (#642)

* Delete trig_tables_bss.c (#650)

* fix typo audio (#656)

* fix typo src actor (#657)

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>

* fix typo include (#658)

* fix course (#659)

* fix typo debug (#660)

* fix typo data (#661)

* replace number with const (#665)

* fix typo buffers (#655)

* fix typo buffers

* tweak ld file

* rename to sMemoryPool

* add a warning

---------

* fix typo src (#654)

* fix typo src

* fix non matcing

* Update code_80091750.c

---------

* fix typo racing (#653)

* fix typo racing

* get it match

* replace G_LINE3D to G_QUAD

---------

* fix typo src (#652)

* fix ending typo (#651)

* Action more info when it doesn't match and fix first diff (#662)

* Update linux-compile.yml

* fix first-diff

* Update first-diff.py

---------

* document texture of kart (#663)

* document texture of kart

* change screenPlayerId to screenId

* some documentation around object

* Revert "some documentation around object"

This reverts commit cbb39078e036bf2a417bed67359e910213acab28.

* more rename

---------

* Make evaluate_collision_players_palm_tree better (#667)

This matches just the same as before,	but using those two casts instead of
shifts seems more likely to be accurate to the original source code

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>

* add fedora instruciton (#666)

* start documenting animation (#668)

* start documenting animation

* Update course_data.c

* change comment

* update libultra asm (#648)

* update libultra asm

* fix gcc __osThreadTail

---------

* Document Vehicles (#641)

* start doc collision

* fix merge

* finish rename fonction related to vehicle

* document around waypoint of vehicle

* make some modification

* make some change and rename one

* copy_ to oldPos

* doc smoke ferry and train

* some rename

* fix some renaming

* precise index

* rename a funciton

* simplify waypoint_vehicles

* change some name

* change some name

* rename move_to_point_direction

* fix some conflict

* Update code_80005FD0.c

* Update code_80005FD0.h

---------

* Label a save info loop (#645)

* save info

* more gcc progress

* fix a value and do a rename (#669)

* update clang and add action (#664)

* update clang and add action

* try clang on course folder only

* forget two file

* Update course_displaylists.inc.c

* forget few other file

* Update course_vertices.inc.c

* format all code while get it match

* second pass

* format other dir

* disable clang format on bad ido code

* fix some tabulation

* revert format on tool dir

* Update clang-format.yml

* ignore gbi.h

* add some read me instruction

* fix error

* format and fixing error

* Update README.md

---------

* Update linkonly_generator.py (#670)

* format more file

* update

* fix compilation issue

* remove course_metadata folder

* re add course metadata folder

* fix banshee bordwalk crash

* fix windows eurk

* Update CMakeLists.txt

---------

1 files changed, 905 insertions, 849 deletions

diff --git a/src/port/ui/UIWidgets.cpp b/src/port/ui/UIWidgets.cpp
index 255d84f26..f1e3badca 100644
--- a/src/port/ui/UIWidgets.cpp
+++ b/src/port/ui/UIWidgets.cpp
@@ -16,1018 +16,1074 @@
 
 namespace UIWidgets {
 
-    // MARK: - Layout Helper
-
-    // Automatically adds newlines to break up text longer than a specified number of characters
-    // Manually included newlines will still be respected and reset the line length
-    // If line is midword when it hits the limit, text should break at the last encountered space
-    char* WrappedText(const char* text, unsigned int charactersPerLine) {
-        std::string newText(text);
-        const size_t tipLength = newText.length();
-        int lastSpace = -1;
-        int currentLineLength = 0;
-        for (unsigned int currentCharacter = 0; currentCharacter < tipLength; currentCharacter++) {
-            if (newText[currentCharacter] == '\n') {
-                currentLineLength = 0;
-                lastSpace = -1;
-                continue;
-            } else if (newText[currentCharacter] == ' ') {
-                lastSpace = currentCharacter;
-            }
+// MARK: - Layout Helper
+
+// Automatically adds newlines to break up text longer than a specified number of characters
+// Manually included newlines will still be respected and reset the line length
+// If line is midword when it hits the limit, text should break at the last encountered space
+char* WrappedText(const char* text, unsigned int charactersPerLine) {
+    std::string newText(text);
+    const size_t tipLength = newText.length();
+    int lastSpace = -1;
+    int currentLineLength = 0;
+    for (unsigned int currentCharacter = 0; currentCharacter < tipLength; currentCharacter++) {
+        if (newText[currentCharacter] == '\n') {
+            currentLineLength = 0;
+            lastSpace = -1;
+            continue;
+        } else if (newText[currentCharacter] == ' ') {
+            lastSpace = currentCharacter;
+        }
+
+        if ((currentLineLength >= charactersPerLine) && (lastSpace >= 0)) {
+            newText[lastSpace] = '\n';
+            currentLineLength = currentCharacter - lastSpace - 1;
+            lastSpace = -1;
+        }
+        currentLineLength++;
+    }
 
-            if ((currentLineLength >= charactersPerLine) && (lastSpace >= 0)) {
-                newText[lastSpace] = '\n';
-                currentLineLength = currentCharacter - lastSpace - 1;
-                lastSpace = -1;
-            }
-            currentLineLength++;
-        }
+    return strdup(newText.c_str());
+}
 
-        return strdup(newText.c_str());
-    }
+char* WrappedText(const std::string& text, unsigned int charactersPerLine) {
+    return WrappedText(text.c_str(), charactersPerLine);
+}
 
-    char* WrappedText(const std::string& text, unsigned int charactersPerLine) {
-        return WrappedText(text.c_str(), charactersPerLine);
+void SetLastItemHoverText(const std::string& text) {
+    if (ImGui::IsItemHovered()) {
+        ImGui::BeginTooltip();
+        ImGui::Text("%s", WrappedText(text, 60));
+        ImGui::EndTooltip();
     }
+}
 
-    void SetLastItemHoverText(const std::string& text) {
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60));
-            ImGui::EndTooltip();
-        }
+void SetLastItemHoverText(const char* text) {
+    if (ImGui::IsItemHovered()) {
+        ImGui::BeginTooltip();
+        ImGui::Text("%s", WrappedText(text, 60));
+        ImGui::EndTooltip();
     }
+}
 
-    void SetLastItemHoverText(const char* text) {
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60));
-            ImGui::EndTooltip();
-        }
+// Adds a "?" next to the previous ImGui item with a custom tooltip
+void InsertHelpHoverText(const std::string& text) {
+    ImGui::SameLine();
+    ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
+    if (ImGui::IsItemHovered()) {
+        ImGui::BeginTooltip();
+        ImGui::Text("%s", WrappedText(text, 60));
+        ImGui::EndTooltip();
     }
+}
 
-    // Adds a "?" next to the previous ImGui item with a custom tooltip
-    void InsertHelpHoverText(const std::string& text) {
-        ImGui::SameLine();
-        ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60));
-            ImGui::EndTooltip();
-        }
+void InsertHelpHoverText(const char* text) {
+    ImGui::SameLine();
+    ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
+    if (ImGui::IsItemHovered()) {
+        ImGui::BeginTooltip();
+        ImGui::Text("%s", WrappedText(text, 60));
+        ImGui::EndTooltip();
     }
+}
 
-    void InsertHelpHoverText(const char* text) {
-        ImGui::SameLine();
-        ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 1.0f), "?");
-        if (ImGui::IsItemHovered()) {
-            ImGui::BeginTooltip();
-            ImGui::Text("%s", WrappedText(text, 60));
-            ImGui::EndTooltip();
-        }
-    }
+// MARK: - UI Elements
 
+void Tooltip(const char* text) {
+    if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("%s", WrappedText(text));
+    }
+}
 
-    // MARK: - UI Elements
+void Spacer(float height) {
+    ImGui::Dummy(ImVec2(0.0f, height));
+}
 
-    void Tooltip(const char* text) {
-        if (ImGui::IsItemHovered()) {
-            ImGui::SetTooltip("%s", WrappedText(text));
-        }
+void PaddedSeparator(bool padTop, bool padBottom, float extraVerticalTopPadding, float extraVerticalBottomPadding) {
+    if (padTop) {
+        Spacer(extraVerticalTopPadding);
     }
-
-    void Spacer(float height) {
-        ImGui::Dummy(ImVec2(0.0f, height));
+    ImGui::Separator();
+    if (padBottom) {
+        Spacer(extraVerticalBottomPadding);
     }
+}
 
-    void PaddedSeparator(bool padTop, bool padBottom, float extraVerticalTopPadding, float extraVerticalBottomPadding) {
-        if (padTop) {
-            Spacer(extraVerticalTopPadding);
-        }
-        ImGui::Separator();
-        if (padBottom) {
-            Spacer(extraVerticalBottomPadding);
-        }
-    }
+void RenderCross(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz) {
+    float thickness = ImMax(sz / 5.0f, 1.0f);
+    sz -= thickness * 0.5f;
+    pos += ImVec2(thickness * 0.25f, thickness * 0.25f);
 
-    void RenderCross(ImDrawList* draw_list, ImVec2 pos, ImU32 col, float sz) {
-        float thickness = ImMax(sz / 5.0f, 1.0f);
-        sz -= thickness * 0.5f;
-        pos += ImVec2(thickness * 0.25f, thickness * 0.25f);
+    draw_list->PathLineTo(ImVec2(pos.x, pos.y));
+    draw_list->PathLineTo(ImVec2(pos.x + sz, pos.y + sz));
+    draw_list->PathStroke(col, 0, thickness);
 
-        draw_list->PathLineTo(ImVec2(pos.x, pos.y));
-        draw_list->PathLineTo(ImVec2(pos.x + sz, pos.y + sz));
-        draw_list->PathStroke(col, 0, thickness);
+    draw_list->PathLineTo(ImVec2(pos.x + sz, pos.y));
+    draw_list->PathLineTo(ImVec2(pos.x, pos.y + sz));
+    draw_list->PathStroke(col, 0, thickness);
+}
 
-        draw_list->PathLineTo(ImVec2(pos.x + sz, pos.y));
-        draw_list->PathLineTo(ImVec2(pos.x, pos.y + sz));
-        draw_list->PathStroke(col, 0, thickness);
+bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic) {
+    ImGuiWindow* window = ImGui::GetCurrentWindow();
+    if (window->SkipItems) {
+        return false;
     }
 
-    bool CustomCheckbox(const char* label, bool* v, bool disabled, CheckboxGraphics disabledGraphic) {
-        ImGuiWindow* window = ImGui::GetCurrentWindow();
-        if (window->SkipItems) {
-            return false;
-        }
+    ImGuiContext& g = *GImGui;
+    const ImGuiStyle& style = g.Style;
+    const ImGuiID id = window->GetID(label);
+    const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
+
+    const float square_sz = ImGui::GetFrameHeight();
+    const ImVec2 pos = window->DC.CursorPos;
+    const ImRect total_bb(
+        pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f),
+                          label_size.y + style.FramePadding.y * 2.0f));
+    ImGui::ItemSize(total_bb, style.FramePadding.y);
+    if (!ImGui::ItemAdd(total_bb, id)) {
+        IMGUI_TEST_ENGINE_ITEM_INFO(id, label,
+                                    g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable |
+                                        (*v ? ImGuiItemStatusFlags_Checked : 0));
+        return false;
+    }
 
-        ImGuiContext& g = *GImGui;
-        const ImGuiStyle& style = g.Style;
-        const ImGuiID id = window->GetID(label);
-        const ImVec2 label_size = ImGui::CalcTextSize(label, NULL, true);
-
-        const float square_sz = ImGui::GetFrameHeight();
-        const ImVec2 pos = window->DC.CursorPos;
-        const ImRect total_bb(pos, pos + ImVec2(square_sz + (label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f), label_size.y + style.FramePadding.y * 2.0f));
-        ImGui::ItemSize(total_bb, style.FramePadding.y);
-        if (!ImGui::ItemAdd(total_bb, id)) {
-            IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
-            return false;
-        }
+    bool hovered, held;
+    bool pressed = ImGui::ButtonBehavior(total_bb, id, &hovered, &held);
+    if (pressed) {
+        *v = !(*v);
+        ImGui::MarkItemEdited(id);
+    }
 
-        bool hovered, held;
-        bool pressed = ImGui::ButtonBehavior(total_bb, id, &hovered, &held);
-        if (pressed) {
-            *v = !(*v);
-            ImGui::MarkItemEdited(id);
-        }
+    const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
+    ImGui::RenderNavHighlight(total_bb, id);
+    ImGui::RenderFrame(check_bb.Min, check_bb.Max,
+                       ImGui::GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive
+                                          : hovered         ? ImGuiCol_FrameBgHovered
+                                                            : ImGuiCol_FrameBg),
+                       true, style.FrameRounding);
+    ImU32 check_col = ImGui::GetColorU32(ImGuiCol_CheckMark);
+    ImU32 cross_col = ImGui::GetColorU32(ImVec4(0.50f, 0.50f, 0.50f, 1.00f));
+    bool mixed_value = (g.LastItemData.InFlags & ImGuiItemFlags_MixedValue) != 0;
+    if (mixed_value) {
+        // Undocumented tristate/mixed/indeterminate checkbox (#2644)
+        // This may seem awkwardly designed because the aim is to make ImGuiItemFlags_MixedValue supported by all
+        // widgets (not just checkbox)
+        ImVec2 pad(ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)), ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)));
+        window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding);
+    } else if ((!disabled && *v) || (disabled && disabledGraphic == CheckboxGraphics::Checkmark)) {
+        const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
+        ImGui::RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f);
+    } else if (disabled && disabledGraphic == CheckboxGraphics::Cross) {
+        const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
+        RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), cross_col, square_sz - pad * 2.0f);
+    }
 
-        const ImRect check_bb(pos, pos + ImVec2(square_sz, square_sz));
-        ImGui::RenderNavHighlight(total_bb, id);
-        ImGui::RenderFrame(check_bb.Min, check_bb.Max, ImGui::GetColorU32((held && hovered) ? ImGuiCol_FrameBgActive : hovered ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg), true, style.FrameRounding);
-        ImU32 check_col = ImGui::GetColorU32(ImGuiCol_CheckMark);
-        ImU32 cross_col = ImGui::GetColorU32(ImVec4(0.50f, 0.50f, 0.50f, 1.00f));
-        bool mixed_value = (g.LastItemData.InFlags & ImGuiItemFlags_MixedValue) != 0;
-        if (mixed_value) {
-            // Undocumented tristate/mixed/indeterminate checkbox (#2644)
-            // This may seem awkwardly designed because the aim is to make ImGuiItemFlags_MixedValue supported by all widgets (not just checkbox)
-            ImVec2 pad(ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)), ImMax(1.0f, IM_FLOOR(square_sz / 3.6f)));
-            window->DrawList->AddRectFilled(check_bb.Min + pad, check_bb.Max - pad, check_col, style.FrameRounding);
-        } else if ((!disabled && *v) || (disabled && disabledGraphic == CheckboxGraphics::Checkmark)) {
-            const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-            ImGui::RenderCheckMark(window->DrawList, check_bb.Min + ImVec2(pad, pad), check_col, square_sz - pad * 2.0f);
-        } else if (disabled && disabledGraphic == CheckboxGraphics::Cross) {
-            const float pad = ImMax(1.0f, IM_FLOOR(square_sz / 6.0f));
-            RenderCross(window->DrawList, check_bb.Min + ImVec2(pad, pad), cross_col, square_sz - pad * 2.0f);
-        }
+    ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
+    if (g.LogEnabled) {
+        ImGui::LogRenderedText(&label_pos, mixed_value ? "[~]" : *v ? "[x]" : "[ ]");
+    }
+    if (label_size.x > 0.0f) {
+        ImGui::RenderText(label_pos, label);
+    }
 
-        ImVec2 label_pos = ImVec2(check_bb.Max.x + style.ItemInnerSpacing.x, check_bb.Min.y + style.FramePadding.y);
-        if (g.LogEnabled) {
-            ImGui::LogRenderedText(&label_pos, mixed_value ? "[~]" : *v ? "[x]" : "[ ]");
-        }
-        if (label_size.x > 0.0f) {
-            ImGui::RenderText(label_pos, label);
-        }
+    IMGUI_TEST_ENGINE_ITEM_INFO(id, label,
+                                g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable |
+                                    (*v ? ImGuiItemStatusFlags_Checked : 0));
+    return pressed;
+}
 
-        IMGUI_TEST_ENGINE_ITEM_INFO(id, label, g.LastItemData.StatusFlags | ImGuiItemStatusFlags_Checkable | (*v ? ImGuiItemStatusFlags_Checked : 0));
-        return pressed;
+void ReEnableComponent(const char* disabledTooltipText) {
+    // End of disable region of previous component
+    ImGui::PopStyleVar(1);
+    if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(disabledTooltipText, "") != 0) {
+        ImGui::SetTooltip("%s", disabledTooltipText);
     }
+    ImGui::PopItemFlag();
+}
 
-    void ReEnableComponent(const char* disabledTooltipText) {
-        // End of disable region of previous component
-        ImGui::PopStyleVar(1);
-        if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(disabledTooltipText, "") != 0) {
-            ImGui::SetTooltip("%s", disabledTooltipText);
-        }
-        ImGui::PopItemFlag();
-    }
+void DisableComponent(const float alpha) {
+    ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
+    ImGui::PushStyleVar(ImGuiStyleVar_Alpha, alpha);
+}
 
-    void DisableComponent(const float alpha) {
-        ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
-        ImGui::PushStyleVar(ImGuiStyleVar_Alpha, alpha);
+bool EnhancementCheckbox(const char* text, const char* cvarName, bool disabled, const char* disabledTooltipText,
+                         CheckboxGraphics disabledGraphic, bool defaultValue) {
+    bool changed = false;
+    if (disabled) {
+        DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
     }
 
-    bool EnhancementCheckbox(const char* text, const char* cvarName, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
-        bool changed = false;
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
-
-        bool val = (bool)CVarGetInteger(cvarName, defaultValue);
-        if (CustomCheckbox(text, &val, disabled, disabledGraphic)) {
-            CVarSetInteger(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-            changed = true;
-        }
+    bool val = (bool) CVarGetInteger(cvarName, defaultValue);
+    if (CustomCheckbox(text, &val, disabled, disabledGraphic)) {
+        CVarSetInteger(cvarName, val);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        changed = true;
+    }
 
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-        }
-        return changed;
+    if (disabled) {
+        ReEnableComponent(disabledTooltipText);
     }
+    return changed;
+}
 
-    bool PaddedEnhancementCheckbox(const char* text, const char* cvarName, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
-        ImGui::BeginGroup();
-        if (padTop) Spacer(0);
+bool PaddedEnhancementCheckbox(const char* text, const char* cvarName, bool padTop, bool padBottom, bool disabled,
+                               const char* disabledTooltipText, CheckboxGraphics disabledGraphic, bool defaultValue) {
+    ImGui::BeginGroup();
+    if (padTop)
+        Spacer(0);
 
-        bool changed = EnhancementCheckbox(text, cvarName, disabled, disabledTooltipText, disabledGraphic, defaultValue);
+    bool changed = EnhancementCheckbox(text, cvarName, disabled, disabledTooltipText, disabledGraphic, defaultValue);
 
-        if (padBottom) Spacer(0);
-        ImGui::EndGroup();
-        return changed;
-    }
+    if (padBottom)
+        Spacer(0);
+    ImGui::EndGroup();
+    return changed;
+}
 
-    bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled, const char* disabledTooltipText, uint8_t disabledValue) {
-        bool changed = false;
-        if (defaultIndex <= 0) {
-            defaultIndex = 0;
-        }
+bool EnhancementCombobox(const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray,
+                         uint8_t defaultIndex, bool disabled, const char* disabledTooltipText, uint8_t disabledValue) {
+    bool changed = false;
+    if (defaultIndex <= 0) {
+        defaultIndex = 0;
+    }
 
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
+    if (disabled) {
+        DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
 
-        uint8_t selected = CVarGetInteger(cvarName, defaultIndex);
-        std::string comboName = std::string("##") + std::string(cvarName);
-        if (ImGui::BeginCombo(comboName.c_str(), comboArray[selected])) {
-            for (uint8_t i = 0; i < comboArray.size(); i++) {
-                if (strlen(comboArray[i]) > 1) {
-                    if (ImGui::Selectable(comboArray[i], i == selected)) {
-                        CVarSetInteger(cvarName, i);
-                        selected = i;
-                        changed = true;
-                        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-                    }
+    uint8_t selected = CVarGetInteger(cvarName, defaultIndex);
+    std::string comboName = std::string("##") + std::string(cvarName);
+    if (ImGui::BeginCombo(comboName.c_str(), comboArray[selected])) {
+        for (uint8_t i = 0; i < comboArray.size(); i++) {
+            if (strlen(comboArray[i]) > 1) {
+                if (ImGui::Selectable(comboArray[i], i == selected)) {
+                    CVarSetInteger(cvarName, i);
+                    selected = i;
+                    changed = true;
+                    Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
                 }
             }
-            ImGui::EndCombo();
         }
+        ImGui::EndCombo();
+    }
 
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
+    if (disabled) {
+        ReEnableComponent(disabledTooltipText);
 
-            if (disabledValue >= 0 && selected != disabledValue) {
-                CVarSetInteger(cvarName, disabledValue);
-                changed = true;
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-            }
+        if (disabledValue >= 0 && selected != disabledValue) {
+            CVarSetInteger(cvarName, disabledValue);
+            changed = true;
+            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
         }
-
-        return changed;
     }
 
-    bool LabeledRightAlignedEnhancementCombobox(const char* label, const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, uint8_t defaultIndex, bool disabled, const char* disabledTooltipText, uint8_t disabledValue) {
-        ImGui::Text(label);
-        s32 currentValue = CVarGetInteger(cvarName, defaultIndex);
+    return changed;
+}
+
+bool LabeledRightAlignedEnhancementCombobox(const char* label, const char* cvarName,
+                                            std::span<const char*, std::dynamic_extent> comboArray,
+                                            uint8_t defaultIndex, bool disabled, const char* disabledTooltipText,
+                                            uint8_t disabledValue) {
+    ImGui::Text(label);
+    s32 currentValue = CVarGetInteger(cvarName, defaultIndex);
 
 #ifdef __WIIU__
-        ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(comboArray[currentValue]).x + 40.0f));
-        ImGui::PushItemWidth(ImGui::CalcTextSize(comboArray[currentValue]).x + 60.0f);
+    ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(comboArray[currentValue]).x + 40.0f));
+    ImGui::PushItemWidth(ImGui::CalcTextSize(comboArray[currentValue]).x + 60.0f);
 #else
-        ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(comboArray[currentValue]).x + 20.0f));
-        ImGui::PushItemWidth(ImGui::CalcTextSize(comboArray[currentValue]).x + 30.0f);
+    ImGui::SameLine(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize(comboArray[currentValue]).x + 20.0f));
+    ImGui::PushItemWidth(ImGui::CalcTextSize(comboArray[currentValue]).x + 30.0f);
 #endif
 
-        bool changed = EnhancementCombobox(cvarName, comboArray, defaultIndex, disabled, disabledTooltipText, disabledValue);
-
-        ImGui::PopItemWidth();
-        return changed;
-    }
+    bool changed =
+        EnhancementCombobox(cvarName, comboArray, defaultIndex, disabled, disabledTooltipText, disabledValue);
 
-    void PaddedText(const char* text, bool padTop, bool padBottom) {
-        if (padTop) Spacer(0);
+    ImGui::PopItemWidth();
+    return changed;
+}
 
-        ImGui::Text("%s", text);
+void PaddedText(const char* text, bool padTop, bool padBottom) {
+    if (padTop)
+        Spacer(0);
 
-        if (padBottom) Spacer(0);
-    }
+    ImGui::Text("%s", text);
 
-    bool EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format, int defaultValue, bool PlusMinusButton, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        int val = CVarGetInteger(cvarName, defaultValue);
+    if (padBottom)
+        Spacer(0);
+}
 
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
+bool EnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format,
+                          int defaultValue, bool PlusMinusButton, bool disabled, const char* disabledTooltipText) {
+    bool changed = false;
+    int val = CVarGetInteger(cvarName, defaultValue);
 
-        ImGui::Text(text, val);
-        Spacer(0);
+    if (disabled) {
+        DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
 
-        ImGui::BeginGroup();
-        if (PlusMinusButton) {
-            std::string MinusBTNName = " - ##" + std::string(cvarName);
-            if (ImGui::Button(MinusBTNName.c_str())) {
-                val--;
-                changed = true;
-            }
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-        }
+    ImGui::Text(text, val);
+    Spacer(0);
 
-        ImGui::PushItemWidth(std::min((ImGui::GetContentRegionAvail().x - (PlusMinusButton ? sliderButtonWidth : 0.0f)), maxSliderWidth));
-        if (ImGui::SliderInt(id, &val, min, max, format, ImGuiSliderFlags_AlwaysClamp))
-        {
+    ImGui::BeginGroup();
+    if (PlusMinusButton) {
+        std::string MinusBTNName = " - ##" + std::string(cvarName);
+        if (ImGui::Button(MinusBTNName.c_str())) {
+            val--;
             changed = true;
         }
-        ImGui::PopItemWidth();
-
-        if (PlusMinusButton) {
-            std::string PlusBTNName = " + ##" + std::string(cvarName);
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-            if (ImGui::Button(PlusBTNName.c_str())) {
-                val++;
-                changed = true;
-            }
-        }
-        ImGui::EndGroup();
+        ImGui::SameLine();
+        ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
+    }
 
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
-        }
+    ImGui::PushItemWidth(
+        std::min((ImGui::GetContentRegionAvail().x - (PlusMinusButton ? sliderButtonWidth : 0.0f)), maxSliderWidth));
+    if (ImGui::SliderInt(id, &val, min, max, format, ImGuiSliderFlags_AlwaysClamp)) {
+        changed = true;
+    }
+    ImGui::PopItemWidth();
 
-        if (val < min) {
-            val = min;
+    if (PlusMinusButton) {
+        std::string PlusBTNName = " + ##" + std::string(cvarName);
+        ImGui::SameLine();
+        ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
+        if (ImGui::Button(PlusBTNName.c_str())) {
+            val++;
             changed = true;
         }
+    }
+    ImGui::EndGroup();
 
-        if (val > max) {
-            val = max;
-            changed = true;
-        }
+    if (disabled) {
+        ReEnableComponent(disabledTooltipText);
+    }
 
-        if (changed) {
-            CVarSetInteger(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-        }
+    if (val < min) {
+        val = min;
+        changed = true;
+    }
 
-        return changed;
+    if (val > max) {
+        val = max;
+        changed = true;
     }
 
-    bool EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        float val = CVarGetFloat(cvarName, defaultValue);
+    if (changed) {
+        CVarSetInteger(cvarName, val);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
 
-        if (disabled) {
-            DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
-        }
+    return changed;
+}
 
-        if (!isPercentage) {
-            ImGui::Text(text, val);
-        } else {
-            ImGui::Text(text, static_cast<int>(100 * val));
-        }
-        Spacer(0);
+bool EnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max,
+                            const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton,
+                            bool disabled, const char* disabledTooltipText) {
+    bool changed = false;
+    float val = CVarGetFloat(cvarName, defaultValue);
 
-        ImGui::BeginGroup();
-        if (PlusMinusButton) {
-            std::string MinusBTNName = " - ##" + std::string(cvarName);
-            if (ImGui::Button(MinusBTNName.c_str())) {
-                if (isPercentage) {
-                    val -= 0.01f;
-                } else {
-                    val -= 0.1f;
-                }
-                changed = true;
-            }
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-        }
+    if (disabled) {
+        DisableComponent(ImGui::GetStyle().Alpha * 0.5f);
+    }
+
+    if (!isPercentage) {
+        ImGui::Text(text, val);
+    } else {
+        ImGui::Text(text, static_cast<int>(100 * val));
+    }
+    Spacer(0);
 
-        ImGui::PushItemWidth(std::min((ImGui::GetContentRegionAvail().x - (PlusMinusButton ? sliderButtonWidth : 0.0f)), maxSliderWidth));
-        if (ImGui::SliderFloat(id, &val, min, max, format, ImGuiSliderFlags_AlwaysClamp)) {
+    ImGui::BeginGroup();
+    if (PlusMinusButton) {
+        std::string MinusBTNName = " - ##" + std::string(cvarName);
+        if (ImGui::Button(MinusBTNName.c_str())) {
             if (isPercentage) {
-                val = roundf(val * 100) / 100;
+                val -= 0.01f;
+            } else {
+                val -= 0.1f;
             }
             changed = true;
         }
-        ImGui::PopItemWidth();
-
-        if (PlusMinusButton) {
-            std::string PlusBTNName = " + ##" + std::string(cvarName);
-            ImGui::SameLine();
-            ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
-            if (ImGui::Button(PlusBTNName.c_str())) {
-                if (isPercentage) {
-                    val += 0.01f;
-                } else {
-                    val += 0.1f;
-                }
-                changed = true;
-            }
-        }
-        ImGui::EndGroup();
+        ImGui::SameLine();
+        ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
+    }
 
-        if (disabled) {
-            ReEnableComponent(disabledTooltipText);
+    ImGui::PushItemWidth(
+        std::min((ImGui::GetContentRegionAvail().x - (PlusMinusButton ? sliderButtonWidth : 0.0f)), maxSliderWidth));
+    if (ImGui::SliderFloat(id, &val, min, max, format, ImGuiSliderFlags_AlwaysClamp)) {
+        if (isPercentage) {
+            val = roundf(val * 100) / 100;
         }
+        changed = true;
+    }
+    ImGui::PopItemWidth();
 
-        if (val < min) {
-            val = min;
+    if (PlusMinusButton) {
+        std::string PlusBTNName = " + ##" + std::string(cvarName);
+        ImGui::SameLine();
+        ImGui::SetCursorPosX(ImGui::GetCursorPosX() - 7.0f);
+        if (ImGui::Button(PlusBTNName.c_str())) {
+            if (isPercentage) {
+                val += 0.01f;
+            } else {
+                val += 0.1f;
+            }
             changed = true;
         }
+    }
+    ImGui::EndGroup();
 
-        if (val > max) {
-            val = max;
-            changed = true;
-        }
+    if (disabled) {
+        ReEnableComponent(disabledTooltipText);
+    }
 
-        if (changed) {
-            CVarSetFloat(cvarName, val);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-        }
+    if (val < min) {
+        val = min;
+        changed = true;
+    }
 
-        return changed;
+    if (val > max) {
+        val = max;
+        changed = true;
     }
 
-    bool PaddedEnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max, const char* format, int defaultValue, bool PlusMinusButton, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        ImGui::BeginGroup();
-        if (padTop) Spacer(0);
+    if (changed) {
+        CVarSetFloat(cvarName, val);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+    }
 
-        changed = EnhancementSliderInt(text, id, cvarName, min, max, format, defaultValue, PlusMinusButton, disabled, disabledTooltipText);
+    return changed;
+}
 
-        if (padBottom) Spacer(0);
-        ImGui::EndGroup();
-        return changed;
-    }
+bool PaddedEnhancementSliderInt(const char* text, const char* id, const char* cvarName, int min, int max,
+                                const char* format, int defaultValue, bool PlusMinusButton, bool padTop, bool padBottom,
+                                bool disabled, const char* disabledTooltipText) {
+    bool changed = false;
+    ImGui::BeginGroup();
+    if (padTop)
+        Spacer(0);
 
-    bool PaddedEnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max, const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton, bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText) {
-        bool changed = false;
-        ImGui::BeginGroup();
-        if (padTop) Spacer(0);
+    changed = EnhancementSliderInt(text, id, cvarName, min, max, format, defaultValue, PlusMinusButton, disabled,
+                                   disabledTooltipText);
 
-        changed = EnhancementSliderFloat(text, id, cvarName, min, max, format, defaultValue, isPercentage, PlusMinusButton, disabled, disabledTooltipText);
+    if (padBottom)
+        Spacer(0);
+    ImGui::EndGroup();
+    return changed;
+}
 
-        if (padBottom) Spacer(0);
-        ImGui::EndGroup();
-        return changed;
-    }
+bool PaddedEnhancementSliderFloat(const char* text, const char* id, const char* cvarName, float min, float max,
+                                  const char* format, float defaultValue, bool isPercentage, bool PlusMinusButton,
+                                  bool padTop, bool padBottom, bool disabled, const char* disabledTooltipText) {
+    bool changed = false;
+    ImGui::BeginGroup();
+    if (padTop)
+        Spacer(0);
 
-    bool EnhancementRadioButton(const char* text, const char* cvarName, int id) {
-        /*Usage :
-        EnhancementRadioButton("My Visible Name","gMyCVarName", MyID);
-        First arg is the visible name of the Radio button
-        Second is the cvar name where MyID will be saved.
-        Note: the CVar name should be the same to each Buddies.
-        Example :
-            EnhancementRadioButton("English", "gLanguages", LANGUAGE_ENG);
-            EnhancementRadioButton("German", "gLanguages", LANGUAGE_GER);
-            EnhancementRadioButton("French", "gLanguages", LANGUAGE_FRA);
-        */
-        std::string make_invisible = "##" + std::string(text) + std::string(cvarName);
+    changed = EnhancementSliderFloat(text, id, cvarName, min, max, format, defaultValue, isPercentage, PlusMinusButton,
+                                     disabled, disabledTooltipText);
 
-        bool ret = false;
-        int val = CVarGetInteger(cvarName, 0);
-        if (ImGui::RadioButton(make_invisible.c_str(), id == val)) {
-            CVarSetInteger(cvarName, id);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-            ret = true;
-        }
-        ImGui::SameLine();
-        ImGui::Text("%s", text);
+    if (padBottom)
+        Spacer(0);
+    ImGui::EndGroup();
+    return changed;
+}
 
-        return ret;
+bool EnhancementRadioButton(const char* text, const char* cvarName, int id) {
+    /*Usage :
+    EnhancementRadioButton("My Visible Name","gMyCVarName", MyID);
+    First arg is the visible name of the Radio button
+    Second is the cvar name where MyID will be saved.
+    Note: the CVar name should be the same to each Buddies.
+    Example :
+        EnhancementRadioButton("English", "gLanguages", LANGUAGE_ENG);
+        EnhancementRadioButton("German", "gLanguages", LANGUAGE_GER);
+        EnhancementRadioButton("French", "gLanguages", LANGUAGE_FRA);
+    */
+    std::string make_invisible = "##" + std::string(text) + std::string(cvarName);
+
+    bool ret = false;
+    int val = CVarGetInteger(cvarName, 0);
+    if (ImGui::RadioButton(make_invisible.c_str(), id == val)) {
+        CVarSetInteger(cvarName, id);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        ret = true;
     }
+    ImGui::SameLine();
+    ImGui::Text("%s", text);
 
-    bool DrawResetColorButton(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha) {
-        bool changed = false;
-        std::string Cvar_RBM = std::string(cvarName) + "RBM";
-        std::string MakeInvisible = "Reset##" + std::string(cvarName) + "Reset";
-        if (ImGui::Button(MakeInvisible.c_str())) {
-            colors->x = defaultcolors.x;
-            colors->y = defaultcolors.y;
-            colors->z = defaultcolors.z;
-            colors->w = has_alpha ? defaultcolors.w : 255.0f;
-
-            Color_RGBA8 colorsRGBA;
-            colorsRGBA.r = defaultcolors.x;
-            colorsRGBA.g = defaultcolors.y;
-            colorsRGBA.b = defaultcolors.z;
-            colorsRGBA.a = has_alpha ? defaultcolors.w : 255.0f;
+    return ret;
+}
 
-            CVarSetColor(cvarName, colorsRGBA);
-            CVarSetInteger(Cvar_RBM.c_str(), 0); //On click disable rainbow mode.
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-            changed = true;
-        }
-        Tooltip("Revert colors to the game's original colors (GameCube version)\nOverwrites previously chosen color");
-        return changed;
+bool DrawResetColorButton(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha) {
+    bool changed = false;
+    std::string Cvar_RBM = std::string(cvarName) + "RBM";
+    std::string MakeInvisible = "Reset##" + std::string(cvarName) + "Reset";
+    if (ImGui::Button(MakeInvisible.c_str())) {
+        colors->x = defaultcolors.x;
+        colors->y = defaultcolors.y;
+        colors->z = defaultcolors.z;
+        colors->w = has_alpha ? defaultcolors.w : 255.0f;
+
+        Color_RGBA8 colorsRGBA;
+        colorsRGBA.r = defaultcolors.x;
+        colorsRGBA.g = defaultcolors.y;
+        colorsRGBA.b = defaultcolors.z;
+        colorsRGBA.a = has_alpha ? defaultcolors.w : 255.0f;
+
+        CVarSetColor(cvarName, colorsRGBA);
+        CVarSetInteger(Cvar_RBM.c_str(), 0); // On click disable rainbow mode.
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        changed = true;
     }
+    Tooltip("Revert colors to the game's original colors (GameCube version)\nOverwrites previously chosen color");
+    return changed;
+}
 
-    void DrawLockColorCheckbox(const char* cvarName) {
-        std::string Cvar_Lock = std::string(cvarName) + "Lock";
-        s32 lock = CVarGetInteger(Cvar_Lock.c_str(), 0);
-        std::string FullName = "Lock##" + Cvar_Lock;
-        EnhancementCheckbox(FullName.c_str(), Cvar_Lock.c_str());
-        Tooltip("Prevents this color from being changed upon selecting \"Randomize all\"");
-    }
+void DrawLockColorCheckbox(const char* cvarName) {
+    std::string Cvar_Lock = std::string(cvarName) + "Lock";
+    s32 lock = CVarGetInteger(Cvar_Lock.c_str(), 0);
+    std::string FullName = "Lock##" + Cvar_Lock;
+    EnhancementCheckbox(FullName.c_str(), Cvar_Lock.c_str());
+    Tooltip("Prevents this color from being changed upon selecting \"Randomize all\"");
+}
 
-    void RainbowColor(const char* cvarName, ImVec4* colors) {
-        std::string Cvar_RBM = std::string(cvarName) + "RBM";
-        std::string MakeInvisible = "Rainbow##" + std::string(cvarName) + "Rainbow";
+void RainbowColor(const char* cvarName, ImVec4* colors) {
+    std::string Cvar_RBM = std::string(cvarName) + "RBM";
+    std::string MakeInvisible = "Rainbow##" + std::string(cvarName) + "Rainbow";
 
-        EnhancementCheckbox(MakeInvisible.c_str(), Cvar_RBM.c_str());
-        Tooltip("Cycles through colors on a timer\nOverwrites previously chosen color");
-    }
+    EnhancementCheckbox(MakeInvisible.c_str(), Cvar_RBM.c_str());
+    Tooltip("Cycles through colors on a timer\nOverwrites previously chosen color");
+}
 
-    void LoadPickersColors(ImVec4& ColorArray, const char* cvarname, const ImVec4& default_colors, bool has_alpha) {
-        Color_RGBA8 defaultColors;
-        defaultColors.r = default_colors.x;
-        defaultColors.g = default_colors.y;
-        defaultColors.b = default_colors.z;
-        defaultColors.a = default_colors.w;
+void LoadPickersColors(ImVec4& ColorArray, const char* cvarname, const ImVec4& default_colors, bool has_alpha) {
+    Color_RGBA8 defaultColors;
+    defaultColors.r = default_colors.x;
+    defaultColors.g = default_colors.y;
+    defaultColors.b = default_colors.z;
+    defaultColors.a = default_colors.w;
 
-        Color_RGBA8 cvarColor = CVarGetColor(cvarname, defaultColors);
+    Color_RGBA8 cvarColor = CVarGetColor(cvarname, defaultColors);
 
-        ColorArray.x = cvarColor.r / 255.0;
-        ColorArray.y = cvarColor.g / 255.0;
-        ColorArray.z = cvarColor.b / 255.0;
-        ColorArray.w = cvarColor.a / 255.0;
-    }
+    ColorArray.x = cvarColor.r / 255.0;
+    ColorArray.y = cvarColor.g / 255.0;
+    ColorArray.z = cvarColor.b / 255.0;
+    ColorArray.w = cvarColor.a / 255.0;
+}
 
-    void DrawFlagArray32(const std::string& name, uint32_t& flags) {
-        ImGui::PushID(name.c_str());
-        for (int32_t flagIndex = 0; flagIndex < 32; flagIndex++) {
-            if ((flagIndex % 8) != 0) {
-                ImGui::SameLine();
-            }
-            ImGui::PushID(flagIndex);
-            uint32_t bitMask = 1 << flagIndex;
-            bool flag = (flags & bitMask) != 0;
-            if (ImGui::Checkbox("##check", &flag)) {
-                if (flag) {
-                    flags |= bitMask;
-                } else {
-                    flags &= ~bitMask;
-                }
+void DrawFlagArray32(const std::string& name, uint32_t& flags) {
+    ImGui::PushID(name.c_str());
+    for (int32_t flagIndex = 0; flagIndex < 32; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint32_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        if (ImGui::Checkbox("##check", &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
             }
-            ImGui::PopID();
         }
         ImGui::PopID();
     }
+    ImGui::PopID();
+}
 
-    void DrawFlagArray16(const std::string& name, uint16_t& flags) {
-        ImGui::PushID(name.c_str());
-        for (int16_t flagIndex = 0; flagIndex < 16; flagIndex++) {
-            if ((flagIndex % 8) != 0) {
-                ImGui::SameLine();
-            }
-            ImGui::PushID(flagIndex);
-            uint16_t bitMask = 1 << flagIndex;
-            bool flag = (flags & bitMask) != 0;
-            if (ImGui::Checkbox("##check", &flag)) {
-                if (flag) {
-                    flags |= bitMask;
-                } else {
-                    flags &= ~bitMask;
-                }
+void DrawFlagArray16(const std::string& name, uint16_t& flags) {
+    ImGui::PushID(name.c_str());
+    for (int16_t flagIndex = 0; flagIndex < 16; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint16_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        if (ImGui::Checkbox("##check", &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
             }
-            ImGui::PopID();
         }
         ImGui::PopID();
     }
+    ImGui::PopID();
+}
 
-    void DrawFlagArray8(const std::string& name, uint8_t& flags) {
-        ImGui::PushID(name.c_str());
-        for (int8_t flagIndex = 0; flagIndex < 8; flagIndex++) {
-            if ((flagIndex % 8) != 0) {
-                ImGui::SameLine();
-            }
-            ImGui::PushID(flagIndex);
-            uint8_t bitMask = 1 << flagIndex;
-            bool flag = (flags & bitMask) != 0;
-            if (ImGui::Checkbox("##check", &flag)) {
-                if (flag) {
-                    flags |= bitMask;
-                } else {
-                    flags &= ~bitMask;
-                }
+void DrawFlagArray8(const std::string& name, uint8_t& flags) {
+    ImGui::PushID(name.c_str());
+    for (int8_t flagIndex = 0; flagIndex < 8; flagIndex++) {
+        if ((flagIndex % 8) != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::PushID(flagIndex);
+        uint8_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        if (ImGui::Checkbox("##check", &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
             }
-            ImGui::PopID();
         }
         ImGui::PopID();
     }
+    ImGui::PopID();
+}
 
-    // V2
+// V2
 
-    void PushStyleMenu(const ImVec4& color) {
-        ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
-        ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_PopupBg, UIWidgets::Colors::DarkGray);
-        ImGui::PushStyleColor(ImGuiCol_Border, UIWidgets::Colors::DarkGray);
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8.0f, 15.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 3.0f);
-    }
+void PushStyleMenu(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_PopupBg, UIWidgets::Colors::DarkGray);
+    ImGui::PushStyleColor(ImGuiCol_Border, UIWidgets::Colors::DarkGray);
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8.0f, 15.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 3.0f);
+}
 
-    void PopStyleMenu() {
-        ImGui::PopStyleVar(2);
-        ImGui::PopStyleColor(4);
-    }
+void PopStyleMenu() {
+    ImGui::PopStyleVar(2);
+    ImGui::PopStyleColor(4);
+}
 
-    bool BeginMenu(const char* label, const ImVec4& color) {
-        bool dirty = false;
-        PushStyleMenu(color);
-        if (ImGui::BeginMenu(label)) {
-            dirty = true;
-        }
-        PopStyleMenu();
-        return dirty;
+bool BeginMenu(const char* label, const ImVec4& color) {
+    bool dirty = false;
+    PushStyleMenu(color);
+    if (ImGui::BeginMenu(label)) {
+        dirty = true;
     }
+    PopStyleMenu();
+    return dirty;
+}
 
-    void PushStyleMenuItem(const ImVec4& color) {
-        ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(20.0f, 15.0f));
+void PushStyleMenuItem(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(20.0f, 15.0f));
+}
+
+void PopStyleMenuItem() {
+    ImGui::PopStyleVar(1);
+    ImGui::PopStyleColor(1);
+}
+
+bool MenuItem(const char* label, const char* shortcut, const ImVec4& color) {
+    bool dirty = false;
+    PushStyleMenuItem(color);
+    if (ImGui::MenuItem(label, shortcut)) {
+        dirty = true;
     }
+    PopStyleMenuItem();
+    return dirty;
+}
+
+void PushStyleButton(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 8.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+void PopStyleButton() {
+    ImGui::PopStyleVar(3);
+    ImGui::PopStyleColor(4);
+}
 
-    void PopStyleMenuItem() {
-        ImGui::PopStyleVar(1);
-        ImGui::PopStyleColor(1);
+bool Button(const char* label, const ButtonOptions& options) {
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleButton(options.color);
+    bool dirty = ImGui::Button(label, options.size);
+    PopStyleButton();
+    ImGui::EndDisabled();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        strcmp(options.disabledTooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip));
     }
+    return dirty;
+}
 
-    bool MenuItem(const char* label, const char* shortcut, const ImVec4& color) {
-        bool dirty = false;
-        PushStyleMenuItem(color);
-        if (ImGui::MenuItem(label, shortcut)) {
-            dirty = true;
-        }
-        PopStyleMenuItem();
-        return dirty;
-    }
-
-    void PushStyleButton(const ImVec4& color) {
-        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
-        ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 0.6f));
-        ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 8.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
-    }
-
-    void PopStyleButton() {
-        ImGui::PopStyleVar(3);
-        ImGui::PopStyleColor(4);
-    }
-
-    bool Button(const char* label, const ButtonOptions& options) {
-        ImGui::BeginDisabled(options.disabled);
-        PushStyleButton(options.color);
-        bool dirty = ImGui::Button(label, options.size);
-        PopStyleButton();
-        ImGui::EndDisabled();
-        if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.disabledTooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
-        } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.tooltip));
-        }
-        return dirty;
+bool WindowButton(const char* label, const char* cvarName, std::shared_ptr<Ship::GuiWindow> windowPtr,
+                  const ButtonOptions& options) {
+    ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
+    std::string buttonText = label;
+    bool dirty = false;
+    if (CVarGetInteger(cvarName, 0)) {
+        buttonText = ICON_FA_WINDOW_CLOSE " " + buttonText;
+    } else {
+        buttonText = ICON_FA_EXTERNAL_LINK_SQUARE " " + buttonText;
+    }
+    if (Button(buttonText.c_str(), options)) {
+        windowPtr->ToggleVisibility();
+        dirty = true;
     }
+    ImGui::PopStyleVar();
+    return dirty;
+}
 
-    bool WindowButton(const char* label, const char* cvarName, std::shared_ptr<Ship::GuiWindow> windowPtr, const ButtonOptions& options) {
-        ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(0, 0));
-        std::string buttonText = label;
-        bool dirty = false;
-        if (CVarGetInteger(cvarName, 0)) {
-            buttonText = ICON_FA_WINDOW_CLOSE " " + buttonText;
-        } else {
-            buttonText = ICON_FA_EXTERNAL_LINK_SQUARE " " + buttonText;
-        }
-        if (Button(buttonText.c_str(), options)) {
-            windowPtr->ToggleVisibility();
-            dirty = true;
-        }
-        ImGui::PopStyleVar();
-        return dirty;
-    }
-
-    void PushStyleCheckbox(const ImVec4& color) {
-        ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.8f));
-        ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
-        ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
-        ImGui::PushStyleColor(ImGuiCol_CheckMark, ImVec4(1.0f, 1.0f, 1.0f, 0.7f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
-    }
-
-    void PopStyleCheckbox() {
-        ImGui::PopStyleVar(3);
-        ImGui::PopStyleColor(5);
-    }
-
-    bool Checkbox(const char* label, bool* value, const CheckboxOptions& options) {
-        ImGui::PushID(label);
-        bool dirty = false;
-        float startX = ImGui::GetCursorPosX();
-        std::string invisibleLabelStr = "##" + std::string(label);
-        const char* invisibleLabel = invisibleLabelStr.c_str();
-        ImGui::BeginDisabled(options.disabled);
-        PushStyleCheckbox(options.color);
-        if (options.alignment == ComponentAlignment::Right) {
-            if (options.labelPosition == LabelPosition::Near || options.labelPosition == LabelPosition::Far || options.labelPosition == LabelPosition::None) {
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::GetStyle().FramePadding.x * 2 - ImGui::GetStyle().ItemSpacing.x);
-            } else if (options.labelPosition == LabelPosition::Above) {
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
-                ImGui::Text(label);
-                ImGui::NewLine();
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::GetStyle().FramePadding.x * 2 - ImGui::GetStyle().ItemSpacing.x);
-            }
-        } else if (options.alignment == ComponentAlignment::Left) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::Text(label);
-            }
+void PushStyleCheckbox(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
+    ImGui::PushStyleColor(ImGuiCol_CheckMark, ImVec4(1.0f, 1.0f, 1.0f, 0.7f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 5.0f);
+}
+
+void PopStyleCheckbox() {
+    ImGui::PopStyleVar(3);
+    ImGui::PopStyleColor(5);
+}
+
+bool Checkbox(const char* label, bool* value, const CheckboxOptions& options) {
+    ImGui::PushID(label);
+    bool dirty = false;
+    float startX = ImGui::GetCursorPosX();
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleCheckbox(options.color);
+    if (options.alignment == ComponentAlignment::Right) {
+        if (options.labelPosition == LabelPosition::Near || options.labelPosition == LabelPosition::Far ||
+            options.labelPosition == LabelPosition::None) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::GetStyle().FramePadding.x * 2 -
+                            ImGui::GetStyle().ItemSpacing.x);
+        } else if (options.labelPosition == LabelPosition::Above) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label);
+            ImGui::NewLine();
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::GetStyle().FramePadding.x * 2 -
+                            ImGui::GetStyle().ItemSpacing.x);
+        }
+    } else if (options.alignment == ComponentAlignment::Left) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::Text(label);
         }
-        dirty = ImGui::Checkbox(invisibleLabel, value);
-        if (options.alignment == ComponentAlignment::Right) {
-            if (options.labelPosition == LabelPosition::Near) {
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x - ImGui::GetStyle().FramePadding.x * 2 - ImGui::GetStyle().ItemSpacing.x * 2);
-                ImGui::Text(label);
-            } else if (options.labelPosition == LabelPosition::Far) {
-                ImGui::SameLine();
-                ImGui::SetCursorPosX(startX);
-                ImGui::Text(label);
-            }
-        } else if (options.alignment == ComponentAlignment::Left) {
-            if (options.labelPosition == LabelPosition::Near) {
-                ImGui::SameLine();
-                ImGui::Text(label);
-            } else if (options.labelPosition == LabelPosition::Far) {
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
-                ImGui::Text(label);
-            }
+    }
+    dirty = ImGui::Checkbox(invisibleLabel, value);
+    if (options.alignment == ComponentAlignment::Right) {
+        if (options.labelPosition == LabelPosition::Near) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x -
+                            ImGui::GetStyle().FramePadding.x * 2 - ImGui::GetStyle().ItemSpacing.x * 2);
+            ImGui::Text(label);
+        } else if (options.labelPosition == LabelPosition::Far) {
+            ImGui::SameLine();
+            ImGui::SetCursorPosX(startX);
+            ImGui::Text(label);
         }
-        PopStyleCheckbox();
-        ImGui::EndDisabled();
-        if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.disabledTooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
-        } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.tooltip));
+    } else if (options.alignment == ComponentAlignment::Left) {
+        if (options.labelPosition == LabelPosition::Near) {
+            ImGui::SameLine();
+            ImGui::Text(label);
+        } else if (options.labelPosition == LabelPosition::Far) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label);
         }
-        ImGui::PopID();
-        return dirty;
     }
+    PopStyleCheckbox();
+    ImGui::EndDisabled();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        strcmp(options.disabledTooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip));
+    }
+    ImGui::PopID();
+    return dirty;
+}
 
-    bool CVarCheckbox(const char* label, const char* cvarName, const CheckboxOptions& options) {
-        bool dirty = false;
-        bool value = (bool)CVarGetInteger(cvarName, options.defaultValue);
-        if (Checkbox(label, &value, options)) {
-            CVarSetInteger(cvarName, value);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-            dirty = true;
-        }
-        return dirty;
-    }
-
-    void PushStyleCombobox(const ImVec4& color) {
-        ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 0.8f));
-        ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.6f));
-        ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
-        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
-        ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
-        ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 0.6f));
-        ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(color.x, color.y, color.z, 0.6f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_PopupRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 0.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
-    }
-
-    void PopStyleCombobox() {
-        ImGui::PopStyleVar(4);
-        ImGui::PopStyleColor(9);
-    }
-
-    bool Combobox(const char* label, uint8_t* value, std::span<const char*, std::dynamic_extent> comboArray, const ComboboxOptions& options) {
-        bool dirty = false;
-        float startX = ImGui::GetCursorPosX();
-        std::string invisibleLabelStr = "##" + std::string(label);
-        const char* invisibleLabel = invisibleLabelStr.c_str();
-        ImGui::PushID(label);
-        ImGui::BeginGroup();
-        ImGui::BeginDisabled(options.disabled);
-        PushStyleCombobox(options.color);
-        if (options.alignment == ComponentAlignment::Left) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::Text(label);
-                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            } else if (options.labelPosition == LabelPosition::Near) {
-                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x - ImGui::GetStyle().ItemSpacing.x * 2);
-            } else if (options.labelPosition == LabelPosition::Far || options.labelPosition == LabelPosition::None) {
-                ImGui::SetNextItemWidth(ImGui::CalcTextSize(comboArray[*value]).x + ImGui::GetStyle().FramePadding.x * 4 + ImGui::GetStyle().ItemSpacing.x);
-            }
-        } else if (options.alignment == ComponentAlignment::Right) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::NewLine();
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
-                ImGui::Text(label);
-                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            } else if (options.labelPosition == LabelPosition::Near) {
-                ImGui::SameLine(ImGui::CalcTextSize(label).x + ImGui::GetStyle().ItemSpacing.x * 2);
-                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            } else if (options.labelPosition == LabelPosition::Far || options.labelPosition == LabelPosition::None) {
-                float width = ImGui::CalcTextSize(comboArray[*value]).x + ImGui::GetStyle().FramePadding.x * 4;
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
-                ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            }
+bool CVarCheckbox(const char* label, const char* cvarName, const CheckboxOptions& options) {
+    bool dirty = false;
+    bool value = (bool) CVarGetInteger(cvarName, options.defaultValue);
+    if (Checkbox(label, &value, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        dirty = true;
+    }
+    return dirty;
+}
+
+void PushStyleCombobox(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(color.x, color.y, color.z, 0.8f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_Header, ImVec4(color.x, color.y, color.z, 0.5f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderActive, ImVec4(color.x, color.y, color.z, 0.6f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_PopupBorderSize, 0.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 6.0f));
+}
+
+void PopStyleCombobox() {
+    ImGui::PopStyleVar(4);
+    ImGui::PopStyleColor(9);
+}
+
+bool Combobox(const char* label, uint8_t* value, std::span<const char*, std::dynamic_extent> comboArray,
+              const ComboboxOptions& options) {
+    bool dirty = false;
+    float startX = ImGui::GetCursorPosX();
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleCombobox(options.color);
+    if (options.alignment == ComponentAlignment::Left) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::Text(label);
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        } else if (options.labelPosition == LabelPosition::Near) {
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x -
+                                    ImGui::GetStyle().ItemSpacing.x * 2);
+        } else if (options.labelPosition == LabelPosition::Far || options.labelPosition == LabelPosition::None) {
+            ImGui::SetNextItemWidth(ImGui::CalcTextSize(comboArray[*value]).x + ImGui::GetStyle().FramePadding.x * 4 +
+                                    ImGui::GetStyle().ItemSpacing.x);
+        }
+    } else if (options.alignment == ComponentAlignment::Right) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label);
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        } else if (options.labelPosition == LabelPosition::Near) {
+            ImGui::SameLine(ImGui::CalcTextSize(label).x + ImGui::GetStyle().ItemSpacing.x * 2);
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        } else if (options.labelPosition == LabelPosition::Far || options.labelPosition == LabelPosition::None) {
+            float width = ImGui::CalcTextSize(comboArray[*value]).x + ImGui::GetStyle().FramePadding.x * 4;
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - width);
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
         }
-        if (ImGui::BeginCombo(invisibleLabel, comboArray[*value], options.flags)) {
-            ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(10.0f, 10.0f));
-            for (uint8_t i = 0; i < comboArray.size(); i++) {
-                if (strlen(comboArray[i]) > 1) {
-                    if (ImGui::Selectable(comboArray[i], i == *value)) {
-                        *value = i;
-                        dirty = true;
-                    }
+    }
+    if (ImGui::BeginCombo(invisibleLabel, comboArray[*value], options.flags)) {
+        ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(10.0f, 10.0f));
+        for (uint8_t i = 0; i < comboArray.size(); i++) {
+            if (strlen(comboArray[i]) > 1) {
+                if (ImGui::Selectable(comboArray[i], i == *value)) {
+                    *value = i;
+                    dirty = true;
                 }
             }
-            ImGui::PopStyleVar();
-            ImGui::EndCombo();
         }
-        if (options.alignment == ComponentAlignment::Left) {
-            if (options.labelPosition == LabelPosition::Near) {
-                ImGui::SameLine();
-                ImGui::Text(label);
-            } else if (options.labelPosition == LabelPosition::Far) {
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
-                ImGui::Text(label);
-            }
-        } else if (options.alignment == ComponentAlignment::Right) {
-            if (options.labelPosition == LabelPosition::Near || options.labelPosition == LabelPosition::Far) {
-                ImGui::SameLine(startX);
-                ImGui::Text(label);
-            }
+        ImGui::PopStyleVar();
+        ImGui::EndCombo();
+    }
+    if (options.alignment == ComponentAlignment::Left) {
+        if (options.labelPosition == LabelPosition::Near) {
+            ImGui::SameLine();
+            ImGui::Text(label);
+        } else if (options.labelPosition == LabelPosition::Far) {
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label);
         }
-        PopStyleCombobox();
-        ImGui::EndDisabled();
-        ImGui::EndGroup();
-        if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.disabledTooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
-        } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.tooltip));
+    } else if (options.alignment == ComponentAlignment::Right) {
+        if (options.labelPosition == LabelPosition::Near || options.labelPosition == LabelPosition::Far) {
+            ImGui::SameLine(startX);
+            ImGui::Text(label);
         }
-        ImGui::PopID();
-        return dirty;
     }
+    PopStyleCombobox();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        strcmp(options.disabledTooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip));
+    }
+    ImGui::PopID();
+    return dirty;
+}
 
-    bool CVarCombobox(const char* label, const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray, const ComboboxOptions& options) {
-        bool dirty = false;
-        uint8_t value = (uint8_t)CVarGetInteger(cvarName, options.defaultIndex);
-        if (Combobox(label, &value, comboArray, options)) {
-            CVarSetInteger(cvarName, value);
-            Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-            dirty = true;
-        }
-        return dirty;
-    }
-
-    void PushStyleSlider(const ImVec4& color) {
-        ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(color.x, color.y, color.z, 1.0f));
-        ImGui::PushStyleColor(ImGuiCol_SliderGrab, ImVec4(1.0, 1.0, 1.0, 0.4f));
-        ImGui::PushStyleColor(ImGuiCol_SliderGrabActive, ImVec4(1.0, 1.0, 1.0, 0.5f));
-        ImGui::PushStyleVar(ImGuiStyleVar_GrabRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 8.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
-    }
-
-    void PopStyleSlider() {
-        ImGui::PopStyleVar(4);
-        ImGui::PopStyleColor(6);
-    }
-
-    bool SliderInt(const char* label, int32_t* value, int32_t min, int32_t max, const IntSliderOptions& options) {
-        bool dirty = false;
-        std::string invisibleLabelStr = "##" + std::string(label);
-        const char* invisibleLabel = invisibleLabelStr.c_str();
-        ImGui::PushID(label);
-        ImGui::BeginGroup();
-        ImGui::BeginDisabled(options.disabled);
-        PushStyleSlider(options.color);
-        if (options.alignment == ComponentAlignment::Left) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::Text(label, *value);
-            }
-        } else if (options.alignment == ComponentAlignment::Right) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::NewLine();
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
-                ImGui::Text(label, *value);
-            }
-        }
-        if (options.showButtons) {
-            if (Button("-", { .color = options.color, .size = Sizes::Inline }) && *value > min) {
-                *value -= options.step;
-                if (*value < min) *value = min;
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-                dirty = true;
-            }
-            ImGui::SameLine(0, 3.0f);
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize("+").x + 20.0f + 3.0f));
-        } else {
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+bool CVarCombobox(const char* label, const char* cvarName, std::span<const char*, std::dynamic_extent> comboArray,
+                  const ComboboxOptions& options) {
+    bool dirty = false;
+    uint8_t value = (uint8_t) CVarGetInteger(cvarName, options.defaultIndex);
+    if (Combobox(label, &value, comboArray, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        dirty = true;
+    }
+    return dirty;
+}
+
+void PushStyleSlider(const ImVec4& color) {
+    ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(color.x, color.y, color.z, 1.0f));
+    ImGui::PushStyleColor(ImGuiCol_SliderGrab, ImVec4(1.0, 1.0, 1.0, 0.4f));
+    ImGui::PushStyleColor(ImGuiCol_SliderGrabActive, ImVec4(1.0, 1.0, 1.0, 0.5f));
+    ImGui::PushStyleVar(ImGuiStyleVar_GrabRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10.0f, 8.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
+}
+
+void PopStyleSlider() {
+    ImGui::PopStyleVar(4);
+    ImGui::PopStyleColor(6);
+}
+
+bool SliderInt(const char* label, int32_t* value, int32_t min, int32_t max, const IntSliderOptions& options) {
+    bool dirty = false;
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleSlider(options.color);
+    if (options.alignment == ComponentAlignment::Left) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::Text(label, *value);
+        }
+    } else if (options.alignment == ComponentAlignment::Right) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label, *value);
         }
-        if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_S32, value, &min, &max, options.format, options.flags)) {
+    }
+    if (options.showButtons) {
+        if (Button("-", { .color = options.color, .size = Sizes::Inline }) && *value > min) {
+            *value -= options.step;
+            if (*value < min)
+                *value = min;
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
             dirty = true;
         }
-        if (options.showButtons) {
-            ImGui::SameLine(0, 3.0f);
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (Button("+", { .color = options.color, .size = Sizes::Inline }) && *value < max) {
-                *value += options.step;
-                if (*value > max) *value = max;
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-                dirty = true;
-            }
-        }
-        PopStyleSlider();
-        ImGui::EndDisabled();
-        ImGui::EndGroup();
-        if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.disabledTooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
-        } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.tooltip));
-        }
-        ImGui::PopID();
-        return dirty;
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize("+").x + 20.0f + 3.0f));
+    } else {
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
     }
-
-    bool CVarSliderInt(const char* label, const char* cvarName, int32_t min, int32_t max, const int32_t defaultValue, const IntSliderOptions& options) {
-        bool dirty = false;
-        int32_t value = CVarGetInteger(cvarName, defaultValue);
-        if (SliderInt(label, &value, min, max, options)) {
-            CVarSetInteger(cvarName, value);
+    if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_S32, value, &min, &max, options.format, options.flags)) {
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        dirty = true;
+    }
+    if (options.showButtons) {
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (Button("+", { .color = options.color, .size = Sizes::Inline }) && *value < max) {
+            *value += options.step;
+            if (*value > max)
+                *value = max;
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
             dirty = true;
         }
-        return dirty;
-    }
-
-    bool SliderFloat(const char* label, float* value, float min, float max, const FloatSliderOptions& options) {
-        bool dirty = false;
-        std::string invisibleLabelStr = "##" + std::string(label);
-        const char* invisibleLabel = invisibleLabelStr.c_str();
-        float valueToDisplay = options.isPercentage ? *value * 100.0f : *value;
-        float maxToDisplay = options.isPercentage ? max * 100.0f : max;
-        float minToDisplay = options.isPercentage ? min * 100.0f : min;
-        ImGui::PushID(label);
-        ImGui::BeginGroup();
-        ImGui::BeginDisabled(options.disabled);
-        PushStyleSlider(options.color);
-        if (options.alignment == ComponentAlignment::Left) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::Text(label, valueToDisplay);
-            }
-        } else if (options.alignment == ComponentAlignment::Right) {
-            if (options.labelPosition == LabelPosition::Above) {
-                ImGui::NewLine();
-                ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
-                ImGui::Text(label, valueToDisplay);
-            }
-        }
-        if (options.showButtons) {
-            if (Button("-", { .color = options.color, .size = Sizes::Inline }) && *value > min) {
-                *value -= options.step;
-                if (*value < min) *value = min;
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-                dirty = true;
-            }
-            ImGui::SameLine(0, 3.0f);
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize("+").x + 20.0f + 3.0f));
-        } else {
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+    }
+    PopStyleSlider();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        strcmp(options.disabledTooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip));
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+bool CVarSliderInt(const char* label, const char* cvarName, int32_t min, int32_t max, const int32_t defaultValue,
+                   const IntSliderOptions& options) {
+    bool dirty = false;
+    int32_t value = CVarGetInteger(cvarName, defaultValue);
+    if (SliderInt(label, &value, min, max, options)) {
+        CVarSetInteger(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        dirty = true;
+    }
+    return dirty;
+}
+
+bool SliderFloat(const char* label, float* value, float min, float max, const FloatSliderOptions& options) {
+    bool dirty = false;
+    std::string invisibleLabelStr = "##" + std::string(label);
+    const char* invisibleLabel = invisibleLabelStr.c_str();
+    float valueToDisplay = options.isPercentage ? *value * 100.0f : *value;
+    float maxToDisplay = options.isPercentage ? max * 100.0f : max;
+    float minToDisplay = options.isPercentage ? min * 100.0f : min;
+    ImGui::PushID(label);
+    ImGui::BeginGroup();
+    ImGui::BeginDisabled(options.disabled);
+    PushStyleSlider(options.color);
+    if (options.alignment == ComponentAlignment::Left) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::Text(label, valueToDisplay);
+        }
+    } else if (options.alignment == ComponentAlignment::Right) {
+        if (options.labelPosition == LabelPosition::Above) {
+            ImGui::NewLine();
+            ImGui::SameLine(ImGui::GetContentRegionAvail().x - ImGui::CalcTextSize(label).x);
+            ImGui::Text(label, valueToDisplay);
         }
-        if (ImGui::SliderScalar(invisibleLabel, ImGuiDataType_Float, &valueToDisplay, &minToDisplay, &maxToDisplay, options.format, options.flags)) {
-            *value = options.isPercentage ? valueToDisplay / 100.0f : valueToDisplay;
+    }
+    if (options.showButtons) {
+        if (Button("-", { .color = options.color, .size = Sizes::Inline }) && *value > min) {
+            *value -= options.step;
+            if (*value < min)
+                *value = min;
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
             dirty = true;
         }
-        if (options.showButtons) {
-            ImGui::SameLine(0, 3.0f);
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (Button("+", { .color = options.color, .size = Sizes::Inline }) && *value < max) {
-                *value += options.step;
-                if (*value > max) *value = max;
-                Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
-                dirty = true;
-            }
-        }
-        PopStyleSlider();
-        ImGui::EndDisabled();
-        ImGui::EndGroup();
-        if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.disabledTooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
-        } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
-            ImGui::SetTooltip("%s", WrappedText(options.tooltip));
-        }
-        ImGui::PopID();
-        return dirty;
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - (ImGui::CalcTextSize("+").x + 20.0f + 3.0f));
+    } else {
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
     }
-
-    bool CVarSliderFloat(const char* label, const char* cvarName, float min, float max, const float defaultValue, const FloatSliderOptions& options) {
-        bool dirty = false;
-        float value = CVarGetFloat(cvarName, defaultValue);
-        if (SliderFloat(label, &value, min, max, options)) {
-            CVarSetFloat(cvarName, value);
+    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();
+        dirty = true;
+    }
+    if (options.showButtons) {
+        ImGui::SameLine(0, 3.0f);
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (Button("+", { .color = options.color, .size = Sizes::Inline }) && *value < max) {
+            *value += options.step;
+            if (*value > max)
+                *value = max;
             Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
             dirty = true;
         }
-        return dirty;
     }
+    PopStyleSlider();
+    ImGui::EndDisabled();
+    ImGui::EndGroup();
+    if (options.disabled && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) &&
+        strcmp(options.disabledTooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.disabledTooltip));
+    } else if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) && strcmp(options.tooltip, "") != 0) {
+        ImGui::SetTooltip("%s", WrappedText(options.tooltip));
+    }
+    ImGui::PopID();
+    return dirty;
+}
+
+bool CVarSliderFloat(const char* label, const char* cvarName, float min, float max, const float defaultValue,
+                     const FloatSliderOptions& options) {
+    bool dirty = false;
+    float value = CVarGetFloat(cvarName, defaultValue);
+    if (SliderFloat(label, &value, min, max, options)) {
+        CVarSetFloat(cvarName, value);
+        Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick();
+        dirty = true;
+    }
+    return dirty;
 }
+} // namespace UIWidgets