diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll
index b4f7601..849f608 100644
Binary files a/GameData/ConformalDecals/Plugins/ConformalDecals.dll and b/GameData/ConformalDecals/Plugins/ConformalDecals.dll differ
diff --git a/Source/ConformalDecals/ModuleConformalText.cs b/Source/ConformalDecals/ModuleConformalText.cs
index 07de33f..5e7221e 100644
--- a/Source/ConformalDecals/ModuleConformalText.cs
+++ b/Source/ConformalDecals/ModuleConformalText.cs
@@ -39,7 +39,7 @@ namespace ConformalDecals {
          UI_Toggle()]
         public bool fillEnabled = true;
 
-        [KSPEvent(guiName = "#LOC_ConformalDecals_gui-fill-color", groupName = "decal-fill", groupDisplayName = "#LOC_ConformalDecals_gui-group-fill",
+        [KSPEvent(guiName = "#LOC_ConformalDecals_gui-set-fill-color", groupName = "decal-fill", groupDisplayName = "#LOC_ConformalDecals_gui-group-fill",
             guiActive = false, guiActiveEditor = true)]
         public void SetFillColor() {
             if (_fillColorPickerController == null) {
@@ -157,12 +157,14 @@ namespace ConformalDecals {
             outlineEnabled = outlineEnabled || (!outlineEnabled && !fillEnabled);
 
             UpdateTweakables();
+            UpdateMaterials();
 
             foreach (var counterpart in part.symmetryCounterparts) {
                 var decal = counterpart.GetComponent<ModuleConformalText>();
                 decal.fillEnabled = fillEnabled;
                 decal.outlineEnabled = outlineEnabled;
                 decal.UpdateTweakables();
+                decal.UpdateMaterials();
             }
         }
 
@@ -171,12 +173,14 @@ namespace ConformalDecals {
             fillEnabled = fillEnabled || (!fillEnabled && !outlineEnabled);
 
             UpdateTweakables();
+            UpdateMaterials();
 
             foreach (var counterpart in part.symmetryCounterparts) {
                 var decal = counterpart.GetComponent<ModuleConformalText>();
                 decal.fillEnabled = fillEnabled;
                 decal.outlineEnabled = outlineEnabled;
                 decal.UpdateTweakables();
+                decal.UpdateMaterials();
             }
         }
 
@@ -204,7 +208,7 @@ namespace ConformalDecals {
         }
 
         public override void OnDestroy() {
-            if (_currentText != null) TextRenderer.UnregisterText(_currentText);
+            if (HighLogic.LoadedSceneIsGame && _currentText != null) TextRenderer.UnregisterText(_currentText);
 
             base.OnDestroy();
         }