Version 5.0.6

system/Output/Plugin/Theme.php

@@ -64,6 +64,9 @@ class Theme
 			case 'custom_css_for_output':
 				return "\IPS\Theme::i()->getCustomCssForOutput()";
 
+			case 'custom_css_for_theme_editor_codebox':
+				return "\IPS\Theme::i()->getCustomCssForThemeEditorCodebox()";
+
 			case 'custom_css':
 				return "\IPS\Theme::i()->custom_css";
 
@@ -92,7 +95,14 @@ class Theme
 						return "\IPS\Theme::i()->getLayoutValue('{$variable}')";
 					}
 
-					return ( array_key_exists( $data, SystemTheme::i()->settings ) ) ? "\IPS\Theme::i()->settings['{$data}']" : '';
+					/* If we are still here, this is legacy syntax; treat it as a variable */
+					$cssVariables = SystemTheme::i()->getCssVariables();
+					if( array_key_exists( $data, $cssVariables ) )
+					{
+						return "\IPS\Theme::i()->getParsedCssVariableFromKey( '{$data}' )";
+					}
+
+					return '';
 				}
 				catch( InvalidArgumentException $e )
 				{