diff --git a/.gitignore b/.gitignore
index be48c14..3de9ba6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Godot-specific ignores
-.godot/
+.godot/*
+!.godot/global_script_class_cache.cfg
 .import/
 gfxrecon_capture_*
 
diff --git a/.godot/global_script_class_cache.cfg b/.godot/global_script_class_cache.cfg
new file mode 100644
index 0000000..597d304
--- /dev/null
+++ b/.godot/global_script_class_cache.cfg
@@ -0,0 +1,115 @@
+list=Array[Dictionary]([{
+"base": &"Node",
+"class": &"AudioStreamPlayerPool",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/ez-sfx-and-music/scenes/AudioStreamPlayerPool/audio_stream_player_pool.gd"
+}, {
+"base": &"AudioStreamPlayer",
+"class": &"AudioStreamPlayerWithFade",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/ez-sfx-and-music/scenes/AudioStreamPlayerWithFade/audio_stream_player_with_fade.gd"
+}, {
+"base": &"Ghost",
+"class": &"BossGhost",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/props/boss_ghost.gd"
+}, {
+"base": &"CanvasLayer",
+"class": &"Fade",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/UniversalFade/Fade.gd"
+}, {
+"base": &"StaticBody3D",
+"class": &"Ghost",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/props/ghost.gd"
+}, {
+"base": &"Node3D",
+"class": &"Healthbar3D",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/gui/healthbar.gd"
+}, {
+"base": &"Control",
+"class": &"Menu",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/gui/menu.gd"
+}, {
+"base": &"CharacterBody3D",
+"class": &"MovementController",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/player/movement_controller.gd"
+}, {
+"base": &"Node",
+"class": &"MusicPlayer",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/ez-sfx-and-music/scenes/MusicPlayer/music_player.gd"
+}, {
+"base": &"RichTextEffect",
+"class": &"Nervous",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/gui/nervous.gd"
+}, {
+"base": &"Node",
+"class": &"OptionsConstants",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/EasyMenus/Scripts/options_constants.gd"
+}, {
+"base": &"Control",
+"class": &"Overlay",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/gui/overlay.gd"
+}, {
+"base": &"Resource",
+"class": &"ProtonScatterBaseShape",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/proton_scatter/src/shapes/base_shape.gd"
+}, {
+"base": &"ProtonScatterBaseShape",
+"class": &"ProtonScatterBoxShape",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/proton_scatter/src/shapes/box_shape.gd"
+}, {
+"base": &"Resource",
+"class": &"ProtonScatterCacheResource",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/proton_scatter/src/common/cache_resource.gd"
+}, {
+"base": &"ProtonScatterBaseShape",
+"class": &"ProtonScatterPathShape",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/proton_scatter/src/shapes/path_shape.gd"
+}, {
+"base": &"ProtonScatterBaseShape",
+"class": &"ProtonScatterSphereShape",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/proton_scatter/src/shapes/sphere_shape.gd"
+}, {
+"base": &"Node",
+"class": &"Scenario",
+"icon": "",
+"language": &"GDScript",
+"path": "res://scripts/scenario.gd"
+}, {
+"base": &"Node",
+"class": &"SfxPlayer",
+"icon": "",
+"language": &"GDScript",
+"path": "res://addons/ez-sfx-and-music/scenes/SfxPlayer/sfx_player.gd"
+}])
diff --git a/Justfile b/Justfile
index e2e11c3..bfac8f4 100644
--- a/Justfile
+++ b/Justfile
@@ -1,5 +1,7 @@
 #!/usr/bin/env -S just --justfile
 
+# === Settings ===
+
 set dotenv-load := true
 
 export PIP_REQUIRE_VIRTUALENV := "true"
@@ -46,6 +48,7 @@ godot_filename := "Godot_v" + godot_version + "-stable_" + godot_platform
 godot_template := "Godot_v" + godot_version + "-stable_export_templates.tpz"
 godot_bin := bin_dir / godot_filename
 godot_editor_data_dir := "~/.local/share/godot/"
+use_x11_wrapper := if godot_platform =~ "x11*" { env("CI", "false") } else { "false" }
 
 # Game variables
 game_name := env_var('GAME_NAME')
@@ -130,7 +133,7 @@ import-resources:
 # Godot binary wrapper
 @godot *ARGS: makedirs install-godot install-templates
     #!/usr/bin/env sh
-    if [ "{{ env("CI", "false") }}" = "true" ]; then
+    if [ "{{ use_x11_wrapper }}" = "true" ]; then
         just ci-godot-x11 {{ ARGS }}
     else
         {{ godot_bin }} {{ ARGS }}