[1.13.x] Backport forge_theme
changes
#526
+9
−4
Merged
forge_theme
changes
#526