diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties
index 764ed83d47..7cd75e4238 100644
--- a/android/assets/jsons/translations/Thai.properties
+++ b/android/assets/jsons/translations/Thai.properties
@@ -9,6 +9,18 @@
 # Don't translate these words to your language, only put 'true' or 'false'.
 StartWithCapitalLetter = false
 
+# Diacritics Support:
+# Underlying libraries operate one character at a time, and with these you define where Unciv will create replacement codepoints with joined glyphs.
+# Each one, including the range, can simply list codes one after the other or you can separate them with blanks when needed or for readability.
+# If your language does not need these, feel free to ignore, or use "" to avoid the "requires translation" mark.
+# Define the range of characters that can join: Supply exactly to characters. This is allowed to include the diacritics below, the actual set of "base" characters will exclude those automatically.
+diacritics_joinable_range = ก ๛
+# List all codes meant to join with the character to the left of them:
+left_joining_diacritics = ั ิ ี ึ ื ุ ู ฺ ็ ่ ้ ๊ ๋ ์ ํ ๎
+# List all codes meant to join with the character to the right of them:
+right_joining_diacritics = ""
+# List all codes meant to join with the character to the left AND with the character to the right:
+left_and_right_joiners = ""
 
 
 # Starting from here normal translations start, as written on
@@ -648,7 +660,7 @@ Anything above 40 may work very slowly on Android! =
  # Requires translation!
 Username = 
  # Requires translation!
-Multiplayer = 
+Multiplayer = ผู้เล่นหลายคน
  # Requires translation!
 Could not download game! = 
  # Requires translation!
@@ -774,7 +786,7 @@ Could not save game to custom location! =
 # Options
 
  # Requires translation!
-Options = 
+Options = ตัวเลือก
  # Requires translation!
 About = 
  # Requires translation!
@@ -1228,24 +1240,24 @@ Golden Age =
  # Requires translation!
 [year] AD = 
  # Requires translation!
-Civilopedia = 
+Civilopedia = พลเรือน
 
  # Requires translation!
-Start new game = 
+Start new game = เริ่มเกมใหม่
  # Requires translation!
-Save game = 
+Save game = บันทึกเกม
  # Requires translation!
-Load game = 
+Load game = โหลดเกมส์
  # Requires translation!
 Main menu = 
  # Requires translation!
-Resume = 
+Resume = ประวัติย่อ
  # Requires translation!
 Cannot resume game! = 
  # Requires translation!
 Not enough memory on phone to load game! = 
  # Requires translation!
-Quickstart = 
+Quickstart = เริ่มต้นอย่างรวดเร็ว
  # Requires translation!
 Cannot start game with the default new game parameters! = 
  # Requires translation!
@@ -1255,7 +1267,7 @@ Social policies =
  # Requires translation!
 Community = 
  # Requires translation!
-Close = 
+Close = ปิด
  # Requires translation!
 Do you want to exit the game? = 
  # Requires translation!
@@ -1818,7 +1830,7 @@ Resolution =
  # Requires translation!
 Tileset = 
  # Requires translation!
-Map editor = 
+Map editor = เครื่องมือแก้ไขแผนที่
  # Requires translation!
 Create = 
  # Requires translation!
@@ -2196,7 +2208,7 @@ Invalid ID! =
 # Mods
 
  # Requires translation!
-Mods = 
+Mods = ม็อด
  # Requires translation!
 Download [modName] = 
  # Requires translation!
diff --git a/core/src/com/unciv/models/translations/Translations.kt b/core/src/com/unciv/models/translations/Translations.kt
index d170c3613c..14c1529552 100644
--- a/core/src/com/unciv/models/translations/Translations.kt
+++ b/core/src/com/unciv/models/translations/Translations.kt
@@ -170,7 +170,6 @@ class Translations : LinkedHashMap<String, TranslationEntry>() {
 
         languages.remove("template")
         languages.remove("completionPercentages")
-        languages.remove("Thai") // Spacing looks horrible, so disable until we figure out what to do with it
 
         return languages.filter { Gdx.files.internal("jsons/translations/$it.properties").exists() }
     }
diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md
index b7c2e9db63..4d685b7e3a 100644
--- a/docs/Modders/uniques.md
+++ b/docs/Modders/uniques.md
@@ -3262,6 +3262,16 @@ If your mod renames Coast or Lakes, do not use this with one of these as paramet
 ??? example  "&lt;upon being promoted&gt;"
 	Applicable to: UnitTriggerCondition
 
+??? example  "&lt;upon gaining the [promotion] promotion&gt;"
+	Example: "&lt;upon gaining the [Shock I] promotion&gt;"
+
+	Applicable to: UnitTriggerCondition
+
+??? example  "&lt;upon losing the [promotion] promotion&gt;"
+	Example: "&lt;upon losing the [Shock I] promotion&gt;"
+
+	Applicable to: UnitTriggerCondition
+
 ??? example  "&lt;upon losing at least [amount] HP in a single attack&gt;"
 	Example: "&lt;upon losing at least [3] HP in a single attack&gt;"
 
@@ -3313,6 +3323,12 @@ If your mod renames Coast or Lakes, do not use this with one of these as paramet
 
 	Applicable to: UnitActionModifier
 
+??? example  "&lt;removing the [promotion] promotion/status&gt;"
+	Removes the promotion/status from the unit - this is not a cost, units will be able to activate the action even without the promotion/status. To limit, use <with the [promotion] promotion> conditional
+	Example: "&lt;removing the [Shock I] promotion/status&gt;"
+
+	Applicable to: UnitActionModifier
+
 ??? example  "&lt;once&gt;"
 	Applicable to: UnitActionModifier