Project Manager Module Dependancies

This check-in adds support for syncing dependencies. Part of that was modifying the actual module syncing code to work how I wanted. So at this point, adding a module to a project will also add all of its dependencies. I also split the AppCore and Audio modules into a BlankGame module that the user can edit. Because they could get replaced, synced modules from the library should never be changed by the user.

editor/EditorCore/gui/guiProfiles.cs

@@ -32,15 +32,15 @@ function EditorCore::SetProfileColors(%this)
 
 function EditorCore::SetProfileFont(%this)
 {
-	if (%this.platform $= "windows")
+	if ($platform $= "windows")
 		%this.platformFontType = "share tech mono";
-	else if (%this.platform $= "Android")
+	else if ($platform $= "Android")
 		%this.platformFontType = "Droid";
 	else
 		%this.platformFontType = "monaco";
-	if (%this.platform $= "ios")
+	if ($platform $= "ios")
 		%this.platformFontSize = 18;
-	else if (%this.platform $= "Android")
+	else if ($platform $= "Android")
 		%this.platformFontSize = 14;
 	else
 		%this.platformFontSize = 12;

editor/EditorCore/scripts/NewProjectDialog.cs

@@ -130,21 +130,29 @@ function NewProjectDialog::onCreate(%this)
 		%description = %this.descBox.getText();
 
 		%path = makeFullPath(%directory, getMainDotCsDir());
-		if(getSubStr(%path, strlen(%path) - 1, 1) !$= "\\")
+		%lastChar = getSubStr(%path, strlen(%path) - 1, 1);
+		if(%lastChar !$= "\\" && %lastChar !$= "\/")
 		{
 			%path = %path @ "\\";
 		}
 		createPath(%path);
 
 		ModuleDatabase.scanModules(pathConcat(getMainDotCsDir(), "library"));
-		ModuleDatabase.CopyModule("AppCore", 1, "AppCore", pathConcat(%path, "AppCore"), false);
-		ModuleDatabase.CopyModule("Audio", 1, "Audio", pathConcat(%path, "Audio"), false);
+		ModuleDatabase.CopyModule("AppCore", 1, "AppCore", %path, true);
+		ModuleDatabase.CopyModule("Audio", 1, "Audio", %path, true);
+		ModuleDatabase.CopyModule("BlankGame", 1, "BlankGame", pathConcat(%path, "BlankGame"), false);
 		ModuleDatabase.clearDatabase();
 
-		%file = TamlRead(pathConcat(%path, "AppCore\\module.taml"));
+		%file = TamlRead(pathConcat(%path, "AppCore", "1", "module.taml"));
 		%file.Project = %title;
 		%file.ProjectDescription = %description;
-		TamlWrite(%file, pathConcat(%path, "AppCore\\module.taml"));
+		TamlWrite(%file, pathConcat(%path, "AppCore", "1", "module.taml"));
+
+		%file = TamlRead(pathConcat(%path, "BlankGame", "module.taml"));
+		%file.Group = "launch";
+		%file.Type = "Game Module";
+		%file.Author = "";
+		TamlWrite(%file, pathConcat(%path, "BlankGame", "module.taml"));
 
 		%data = new ScriptObject()
 		{

editor/ProjectManager/ProjectManager.cs

@@ -148,6 +148,7 @@ function ProjectManager::getProjectFolder(%this)
 
 function ProjectManager::onModuleInstalled(%this, %module)
 {
-	%this.gamePanel.addModule(%module, %module);
-	%this.gamePanel.sortModules();
+	%allModules = ModuleDatabase.findModules(false);
+	%this.gamePanel.onOpen(%allModules);
+	%this.libraryPanel.onOpen(%allModules);
 }

editor/ProjectManager/scripts/ProjectLibraryPanel.cs

@@ -24,7 +24,10 @@ function ProjectLibraryPanel::load(%this)
 
 function ProjectLibraryPanel::addModule(%this, %module)
 {
-	%this.list.addItemWithID(%this.getModuleName(%module), %module);
+	if(%module.type !$= "Template")
+	{
+		%this.list.addItemWithID(%this.getModuleName(%module), %module);
+	}
 }
 
 function ProjectLibraryPanel::onOpen(%this, %allModules)
@@ -71,24 +74,11 @@ function ProjectLibraryPanel::onInstallClick(%this)
 
 	if(isObject(%module))
 	{
-		%newModulePath = pathConcat(ProjectManager.getProjectFolder(), %module.moduleID);
-		%this.manager.CopyModule(%module.moduleID, %module.versionID, %module.moduleID, %newModulePath, false);
-		//%this.manager.synchronizeDependencies(%module, pathConcat(ProjectManager.getProjectFolder()));
-
-		%file = TamlRead(pathConcat(%newModulePath, "module.taml"));
-		%file.Group = "";
-		TamlWrite(%file, pathConcat(%newModulePath, "module.taml"));
+		%this.manager.CopyModule(%module.moduleID, %module.versionID, %module.moduleID, ProjectManager.getProjectFolder(), true);
+		%this.manager.synchronizeDependencies(%module, ProjectManager.getProjectFolder());
 
-		ModuleDatabase.ScanModules(%newModulePath);
-		ModuleDatabase.LoadExplicit(%module.moduleID, %module.versionID);
+		ModuleDatabase.ScanModules(ProjectManager.getProjectFolder());
 		%installedModule = ModuleDatabase.findModule(%module.moduleID, %module.versionID);
-
-		%this.list.setItemColor(%index, "255 255 100 255");
-
-		%file = TamlRead(pathConcat(%newModulePath, "module.taml"));
-		%file.Group = "gameBase";
-		TamlWrite(%file, pathConcat(%newModulePath, "module.taml"));
-
 		%this.postEvent("ModuleInstalled", %installedModule);
 	}
 }

engine/source/module/moduleManager.cc

@@ -1389,30 +1389,8 @@ bool ModuleManager::synchronizeDependencies( ModuleDefinition* pRootModuleDefini
             // Is the specific module definition present in the target?
             if ( definitionItr != NULL )
             {
-                // Yes, so fetch the module definition.
-                ModuleDefinition* pTargetModuleDefinition = *definitionItr;
-
-                // Fetch the target module build Id.
-                const U32 targetBuildId = pTargetModuleDefinition->getBuildId();
-
-                // Fetch the target module path.
-                StringTableEntry targetModulePath = pTargetModuleDefinition->getModulePath();
-
-                // Remove the target module definition from the database.
-                targetModuleManager.removeModuleDefinition( pTargetModuleDefinition );
-
-                // Skip if the target definition is the same build Id.
-                if ( targetBuildId == sourceBuildId )
-                    continue;
-
-                // Delete the target module definition folder.
-                if ( !Platform::deleteDirectory( targetModulePath ) )
-                {
-                    // Warn.
-                    Con::warnf("Cannot synchronize dependencies for module Id '%s' at version Id '%d' as the old module at '%s' could not be deleted.",
-                        sourceModuleId, sourceVersionId, targetModulePath );
-                    return false;
-                }
+                // Yes, so move along.
+                continue;
             }
         }
 
@@ -1433,25 +1411,6 @@ bool ModuleManager::synchronizeDependencies( ModuleDefinition* pRootModuleDefini
         }
     }
 
-    // Find any target modules left, These are orphaned modules not depended upon by any other module.
-    typeConstModuleDefinitionVector orphanedTargetModules;
-    targetModuleManager.findModules( false, orphanedTargetModules );
-
-    // Iterate module definitions.
-    for ( typeConstModuleDefinitionVector::const_iterator moduleDefinitionItr = orphanedTargetModules.begin(); moduleDefinitionItr != orphanedTargetModules.end(); ++moduleDefinitionItr )
-    {
-        // Fetch orphaned module definition.
-        const ModuleDefinition* pOrphanedModuleDefinition = *moduleDefinitionItr;
-       
-        // Delete the target module definition folder.
-        if ( !Platform::deleteDirectory( pOrphanedModuleDefinition->getModulePath() ) )
-        {
-            // Warn.
-            Con::warnf("Cannot delete orphaned module Id '%s' at version Id '%d' from '%s'.",
-                pOrphanedModuleDefinition->getModuleId(), pOrphanedModuleDefinition->getVersionId(), pOrphanedModuleDefinition->getModulePath() );
-        }
-    }
-
     return true;
 }
 
@@ -1973,11 +1932,6 @@ bool ModuleManager::registerModule( const char* pModulePath, const char* pModule
     // Is the module group already loaded?
     if ( findGroupLoaded( moduleGroup ) != NULL )
     {
-        // Yes, so warn.
-        Con::warnf( "Module Manager: Found module: '%s' but it is in a module group '%s' which has already been loaded.",
-            pModuleDefinition->getModuleFilePath(),
-            moduleGroup );
-
         // Destroy module definition and finish.
         pModuleDefinition->deleteObject();
         return false;
@@ -2010,10 +1964,6 @@ bool ModuleManager::registerModule( const char* pModulePath, const char* pModule
         // Does this version Id already exist?
         if ( definitionItr != NULL )
         {
-            // Yes, so warn.
-            Con::warnf( "Module Manager: Found module: '%s' but it is already registered as module Id '%s' at version Id '%d'.",
-                pModuleDefinition->getModuleFilePath(), moduleId, versionId );
-
             // Destroy module definition and finish.
             pModuleDefinition->deleteObject();
             return false;

library/AppCore/appCore.cs

@@ -22,9 +22,6 @@
 
 function AppCore::create( %this )
 {
-	// Init variables
-	%this.canvasCreated = false;
-
     // Load system scripts
     exec("./scripts/constants.cs");
     exec("./scripts/defaultPreferences.cs");
@@ -32,19 +29,10 @@ function AppCore::create( %this )
     exec("./scripts/canvas.cs");
 
     // Initialize the canvas
-    %this.initializeCanvas("Torque2D: Rocket Edition");
+    %this.initializeCanvas(%this.Project);
 
 	// Load other modules
-    ModuleDatabase.loadGroup("gameBase");
-
-	// Put a gui in the Canvas
-	Canvas.setContent(TamlRead("./gui/defaultGui.gui.taml"));
-
-	// Play Music - If you are using the standard Audio module
-	if(isObject(Audio))
-	{
-		Audio.PlayMusic("planetfall");
-	}
+    ModuleDatabase.loadGroup("launch");
 }
 
 //-----------------------------------------------------------------------------

library/AppCore/gui/guiProfiles.cs

@@ -20,27 +20,33 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-if ($platform $= "windows")
-	$platformFontType = "share tech mono";
-else if ($platform $= "Android")
-	$platformFontType = "Droid";
-else
-	$platformFontType = "monaco";
-if ($platform $= "ios")
-	$platformFontSize = 18;
-else if ($platform $= "Android")
-	$platformFontSize = 14;
-else
-	$platformFontSize = 12;
-
-$color[1] = "43 43 43 255";
-$color[2] = "81 92 102 255";
-$color[3] = "224 224 224 255";
-$color[4] = "54 135 196 255";
-$color[5] = "245 210 50 255";
-$color[6] = "196 54 71 255";
-
-function AdjustColorValue(%color, %percent)
+function AppCore::SetProfileColors(%this)
+{
+	%this.color[1] = "43 43 43 255";
+	%this.color[2] = "81 92 102 255";
+	%this.color[3] = "224 224 224 255";
+	%this.color[4] = "54 135 196 255";
+	%this.color[5] = "245 210 50 255";
+	%this.color[6] = "196 54 71 255";
+}
+
+function AppCore::SetProfileFont(%this)
+{
+	if ($platform $= "windows")
+		%this.platformFontType = "share tech mono";
+	else if ($platform $= "Android")
+		%this.platformFontType = "Droid";
+	else
+		%this.platformFontType = "monaco";
+	if ($platform $= "ios")
+		%this.platformFontSize = 18;
+	else if ($platform $= "Android")
+		%this.platformFontSize = 14;
+	else
+		%this.platformFontSize = 12;
+}
+
+function AppCore::AdjustColorValue(%this, %color, %percent)
 {
 	%red = getWord(%color, 0);
 	%green = getWord(%color, 1);
@@ -62,7 +68,7 @@ function AdjustColorValue(%color, %percent)
 	return %newColor;
 }
 
-function SetColorAlpha(%color, %newAlpha)
+function AppCore::SetColorAlpha(%this, %color, %newAlpha)
 {
 	%red = getWord(%color, 0);
 	%green = getWord(%color, 1);
@@ -70,12 +76,12 @@ function SetColorAlpha(%color, %newAlpha)
 	return %red SPC %green SPC %blue SPC mRound(mClamp(%newAlpha, 0, 255));
 }
 
-function SafeCreateNamedObject(%name, %object)
+function AppCore::SafeCreateNamedObject(%this, %name, %object)
 {
 	if(isObject(%name))
 	{
 		%originalObject = nameToID(%name);
-		if(%originalObject.getClassName() !$= %object.getClassName())
+		if(%orginalObject.getClassName() !$= %object.getClassName())
 		{
 			warn("Attempted to change the class of the named object " @ %name @ "!");
 			warn("Original Class: " @ %originalObject.getClassName());
@@ -91,899 +97,902 @@ function SafeCreateNamedObject(%name, %object)
 	}
 }
 
-//-----------------------------------------------------------------------------
-
-
-SafeCreateNamedObject("DefaultCursor", new GuiCursor()
+function AppCore::createGuiProfiles(%this)
 {
-    hotSpot = "1 1";
-    renderOffset = "0 0";
-    bitmapName = "^AppCore/gui/images/cursors/defaultCursor";
-});
+	%this.SetProfileColors();
+	%this.SetProfileFont();
 
-SafeCreateNamedObject("LeftRightCursor", new GuiCursor()
-{
-   hotSpot = "0.5 0";
-   renderOffset = "0.5 0";
-   bitmapName = "^AppCore/gui/images/cursors/leftRight";
-});
+	%this.SafeCreateNamedObject("DefaultCursor", new GuiCursor()
+	{
+	    hotSpot = "1 1";
+	    renderOffset = "0 0";
+	    bitmapName = "^AppCore/gui/images/cursors/defaultCursor";
+	});
 
-SafeCreateNamedObject("UpDownCursor", new GuiCursor()
-{
-   hotSpot = "1 1";
-   renderOffset = "0 1";
-   bitmapName = "^AppCore/gui/images/cursors/upDown";
-});
+	%this.SafeCreateNamedObject("LeftRightCursor", new GuiCursor()
+	{
+	   hotSpot = "0.5 0";
+	   renderOffset = "0.5 0";
+	   bitmapName = "^AppCore/gui/images/cursors/leftRight";
+	});
 
-SafeCreateNamedObject("NWSECursor", new GuiCursor()
-{
-   hotSpot = "1 1";
-   renderOffset = "0.5 0.5";
-   bitmapName = "^AppCore/gui/images/cursors/NWSE";
-});
+	%this.SafeCreateNamedObject("UpDownCursor", new GuiCursor()
+	{
+	   hotSpot = "1 1";
+	   renderOffset = "0 1";
+	   bitmapName = "^AppCore/gui/images/cursors/upDown";
+	});
 
-SafeCreateNamedObject("NESWCursor", new GuiCursor()
-{
-   hotSpot = "1 1";
-   renderOffset = "0.5 0.5";
-   bitmapName = "^AppCore/gui/images/cursors/NESW";
-});
+	%this.SafeCreateNamedObject("NWSECursor", new GuiCursor()
+	{
+	   hotSpot = "1 1";
+	   renderOffset = "0.5 0.5";
+	   bitmapName = "^AppCore/gui/images/cursors/NWSE";
+	});
 
-SafeCreateNamedObject("MoveCursor", new GuiCursor()
-{
-   hotSpot = "1 1";
-   renderOffset = "0.5 0.5";
-   bitmapName = "^AppCore/gui/images/cursors/move";
-});
+	%this.SafeCreateNamedObject("NESWCursor", new GuiCursor()
+	{
+	   hotSpot = "1 1";
+	   renderOffset = "0.5 0.5";
+	   bitmapName = "^AppCore/gui/images/cursors/NESW";
+	});
 
-SafeCreateNamedObject("EditCursor", new GuiCursor()
-{
-   hotSpot = "0 0";
-   renderOffset = "0.5 0.5";
-   bitmapName = "^AppCore/gui/images/cursors/ibeam";
-});
+	%this.SafeCreateNamedObject("MoveCursor", new GuiCursor()
+	{
+	   hotSpot = "1 1";
+	   renderOffset = "0.5 0.5";
+	   bitmapName = "^AppCore/gui/images/cursors/move";
+	});
 
-//Changing the default gui profile and border profile might cause engine instability! Consider making a new child profile instead.
-SafeCreateNamedObject("GuiDefaultBorderProfile", new GuiBorderProfile()
-{
-	// Default margin
-	margin = 0;
-	marginHL = 0;
-	marginSL = 0;
-	marginNA = 0;
-	//Default Border
-	border = 0;
-	borderHL = 0;
-	borderSL = 0;
-	borderNA = 0;
-	//Default border color
-	borderColor   = $color1;
-    borderColorHL = AdjustColorValue($color1, 10);
-    borderColorSL = AdjustColorValue($color1, 10);
-    borderColorNA = SetColorAlpha($color1, 100);
-	//Default Padding
-	padding = 0;
-	paddingHL = 0;
-	paddingSL = 0;
-	paddingNA = 0;
-	//Default underfill
-	underfill = true;
-});
-
-//See the warning above! You should avoid changing this.
-SafeCreateNamedObject("GuiDefaultProfile", new GuiControlProfile()
-{
-    // fill color
-    fillColor = "0 0 0 0";
+	%this.SafeCreateNamedObject("EditCursor", new GuiCursor()
+	{
+	   hotSpot = "0 0";
+	   renderOffset = "0.5 0.5";
+	   bitmapName = "^AppCore/gui/images/cursors/ibeam";
+	});
 
-    // font
-    fontType = $platformFontType;
-	fontDirectory = expandPath( "^AppCore/fonts" );
-    fontSize = $platformFontSize;
-    fontColor = "255 255 255 255";
-	align = center;
-	vAlign = middle;
+	//Changing the default gui profile and border profile might cause engine instability! Consider making a new child profile instead.
+	%this.SafeCreateNamedObject("GuiDefaultBorderProfile", new GuiBorderProfile()
+	{
+		// Default margin
+		margin = 0;
+		marginHL = 0;
+		marginSL = 0;
+		marginNA = 0;
+		//Default Border
+		border = 0;
+		borderHL = 0;
+		borderSL = 0;
+		borderNA = 0;
+		//Default border color
+		borderColor   = %this.color1;
+	    borderColorHL = %this.AdjustColorValue(%this.color1, 10);
+	    borderColorSL = %this.AdjustColorValue(%this.color1, 10);
+	    borderColorNA = %this.SetColorAlpha(%this.color1, 100);
+		//Default Padding
+		padding = 0;
+		paddingHL = 0;
+		paddingSL = 0;
+		paddingNA = 0;
+		//Default underfill
+		underfill = true;
+	});
+
+	//See the warning above! You should avoid changing this.
+	%this.SafeCreateNamedObject("GuiDefaultProfile", new GuiControlProfile()
+	{
+	    // fill color
+	    fillColor = "0 0 0 0";
 
-	cursorColor = "0 0 0 255";
+	    // font
+	    fontType = %this.platformFontType;
+		fontDirectory = expandPath( "^AppCore/fonts" );
+	    fontSize = %this.platformFontSize;
+	    fontColor = "255 255 255 255";
+		align = center;
+		vAlign = middle;
 
-	borderDefault = GuiDefaultBorderProfile;
-	category = "default";
-});
+		cursorColor = "0 0 0 255";
 
-SafeCreateNamedObject("GuiBrightBorderProfile", new GuiBorderProfile()
-{
-	border = 2;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 2;
+		borderDefault = GuiDefaultBorderProfile;
+		category = "default";
+	});
 
-	borderColor = "255 255 255 50";
-	borderColorHL = "255 255 255 50";
-	borderColorSL = "255 255 255 50";
-	borderColorNA = "255 255 255 50";
+	%this.SafeCreateNamedObject("GuiBrightBorderProfile", new GuiBorderProfile()
+	{
+		border = 2;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 2;
 
-	underfill = true;
-});
+		borderColor = "255 255 255 50";
+		borderColorHL = "255 255 255 50";
+		borderColorSL = "255 255 255 50";
+		borderColorNA = "255 255 255 50";
 
-SafeCreateNamedObject("GuiDarkBorderProfile", new GuiBorderProfile()
-{
-	border = 2;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 2;
+		underfill = true;
+	});
 
-	borderColor = "0 0 0 50";
-	borderColorHL = "0 0 0 50";
-	borderColorSL = "0 0 0 50";
-	borderColorNA = "0 0 0 50";
+	%this.SafeCreateNamedObject("GuiDarkBorderProfile", new GuiBorderProfile()
+	{
+		border = 2;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 2;
 
-	underfill = true;
-});
+		borderColor = "0 0 0 50";
+		borderColorHL = "0 0 0 50";
+		borderColorSL = "0 0 0 50";
+		borderColorNA = "0 0 0 50";
 
-SafeCreateNamedObject("GuiPanelProfile", new GuiControlProfile()
-{
-	fillColor = $color1;
-    fillColorHL = AdjustColorValue($color1, 10);
-    fillColorSL = AdjustColorValue($color1, 15);
-    fillColorNA = SetColorAlpha($color1, 100);
-	borderDefault = GuiBrightBorderProfile;
-	category = "defaultPanel";
-});
-
-SafeCreateNamedObject("GuiListBoxBorderProfile", new GuiBorderProfile()
-{
-	margin = 1;
-	marginHL = 1;
-	marginSL = 1;
-	marginNA = 1;
-
-	padding = 4;
-	paddingHL = 4;
-	paddingSL = 4;
-	paddingNA = 4;
-});
-
-SafeCreateNamedObject("GuiListBoxProfile", new GuiControlProfile()
-{
-    // fill color
-    fillColor = $color1;
-    fillColorHL = AdjustColorValue($color1, 10);
-    fillColorSL = $color4;
-    fillColorNA = SetColorAlpha($color1, 100);
-	align = left;
-
-	tab = false;
-	canKeyFocus = true;
-	category = "defaultListBox";
-
-	fontColor = $color3;
-	fontColorHL = AdjustColorValue($color3, 20);
-	fontColorSL = AdjustColorValue($color3, 20);
-	fontColorNA = AdjustColorValue($color3, -30);
-
-	borderDefault = GuiListBoxBorderProfile;
-});
-
-SafeCreateNamedObject("GuiWindowBorderProfile", new GuiBorderProfile()
-{
-	padding = 10;
-	paddingHL = 10;
-	paddingSL = 10;
-	paddingNA = 4;
-});
+		underfill = true;
+	});
 
-SafeCreateNamedObject("GuiWindowProfile", new GuiControlProfile()
-{
-   fillColor = AdjustColorValue($color1, 10);
-   fillColorHL = AdjustColorValue($color1, 12);
-   fillColorSL = $color4;
-   fillColorNA = $color1;
-   category = "defaultWindow";
-   align = "Left";
+	%this.SafeCreateNamedObject("GuiPanelProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color1;
+	    fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+	    fillColorSL = %this.AdjustColorValue(%this.color1, 15);
+	    fillColorNA = %this.SetColorAlpha(%this.color1, 100);
+		borderDefault = GuiBrightBorderProfile;
+		category = "defaultPanel";
+	});
+
+	%this.SafeCreateNamedObject("GuiListBoxBorderProfile", new GuiBorderProfile()
+	{
+		margin = 1;
+		marginHL = 1;
+		marginSL = 1;
+		marginNA = 1;
+
+		padding = 4;
+		paddingHL = 4;
+		paddingSL = 4;
+		paddingNA = 4;
+	});
+
+	%this.SafeCreateNamedObject("GuiListBoxProfile", new GuiControlProfile()
+	{
+	    // fill color
+	    fillColor = %this.color1;
+	    fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+	    fillColorSL = %this.color4;
+	    fillColorNA = %this.SetColorAlpha(%this.color1, 100);
+		align = left;
+
+		tab = false;
+		canKeyFocus = true;
+		category = "defaultListBox";
+
+		fontColor = %this.color3;
+		fontColorHL = %this.AdjustColorValue(%this.color3, 20);
+		fontColorSL = %this.AdjustColorValue(%this.color3, 20);
+		fontColorNA = %this.AdjustColorValue(%this.color3, -30);
+
+		borderDefault = GuiListBoxBorderProfile;
+	});
+
+	%this.SafeCreateNamedObject("GuiWindowBorderProfile", new GuiBorderProfile()
+	{
+		padding = 10;
+		paddingHL = 10;
+		paddingSL = 10;
+		paddingNA = 4;
+	});
 
-   fontColorSL = $color5;
+	%this.SafeCreateNamedObject("GuiWindowProfile", new GuiControlProfile()
+	{
+	   fillColor = %this.AdjustColorValue(%this.color1, 10);
+	   fillColorHL = %this.AdjustColorValue(%this.color1, 12);
+	   fillColorSL = %this.color4;
+	   fillColorNA = %this.color1;
+	   category = "defaultWindow";
+	   align = "Left";
 
-   borderLeft = GuiWindowBorderProfile;
-});
+	   fontColorSL = %this.color5;
 
-SafeCreateNamedObject("GuiWindowContentBorderProfile", new GuiBorderProfile()
-{
-	borderColor = AdjustColorValue($color1, 10);
-	borderColorSL = AdjustColorValue($color4, -10);
+	   borderLeft = GuiWindowBorderProfile;
+	});
 
-	border = 3;
-	borderSL = 3;
-});
+	%this.SafeCreateNamedObject("GuiWindowContentBorderProfile", new GuiBorderProfile()
+	{
+		borderColor = %this.AdjustColorValue(%this.color1, 10);
+		borderColorSL = %this.AdjustColorValue(%this.color4, -10);
 
-SafeCreateNamedObject("GuiWindowContentProfile", new GuiControlProfile()
-{
-	fillColor = AdjustColorValue($color1, -10);
-	fillColorSL = AdjustColorValue($color1, -10);
+		border = 3;
+		borderSL = 3;
+	});
 
-	borderDefault = GuiWindowContentBorderProfile;
-	borderTop = GuiDefaultBorderProfile;
-});
+	%this.SafeCreateNamedObject("GuiWindowContentProfile", new GuiControlProfile()
+	{
+		fillColor = %this.AdjustColorValue(%this.color1, -10);
+		fillColorSL = %this.AdjustColorValue(%this.color1, -10);
 
-SafeCreateNamedObject("GuiWindowButtonBorderProfile", new GuiBorderProfile()
-{
-	margin = 1;
-	marginHL = 1;
-	marginSL = 1;
-	marginNA = 1;
-
-	padding = 3;
-	paddingHL = 3;
-	paddingSL = 3;
-	paddingNA = 3;
-});
-
-SafeCreateNamedObject("GuiWindowCloseButtonProfile", new GuiControlProfile()
-{
-   fillColor = SetColorAlpha($color1, 150);
-   fillColorHL = SetColorAlpha($color6, 150);
-   fillColorSL = AdjustColorValue($color6, 10);
-   fillColorNA = $color1;
+		borderDefault = GuiWindowContentBorderProfile;
+		borderTop = GuiDefaultBorderProfile;
+	});
 
-   fontColor = SetColorAlpha($color3, 150);
-   fontColorHL = SetColorAlpha($color3, 170);
-   fontColorSL = $color5;
-   fontColorNA = SetColorAlpha($color3, 150);
+	%this.SafeCreateNamedObject("GuiWindowButtonBorderProfile", new GuiBorderProfile()
+	{
+		margin = 1;
+		marginHL = 1;
+		marginSL = 1;
+		marginNA = 1;
+
+		padding = 3;
+		paddingHL = 3;
+		paddingSL = 3;
+		paddingNA = 3;
+	});
+
+	%this.SafeCreateNamedObject("GuiWindowCloseButtonProfile", new GuiControlProfile()
+	{
+	   fillColor = %this.SetColorAlpha(%this.color1, 150);
+	   fillColorHL = %this.SetColorAlpha(%this.color6, 150);
+	   fillColorSL = %this.AdjustColorValue(%this.color6, 10);
+	   fillColorNA = %this.color1;
 
-   borderDefault = GuiWindowButtonBorderProfile;
-});
+	   fontColor = %this.SetColorAlpha(%this.color3, 150);
+	   fontColorHL = %this.SetColorAlpha(%this.color3, 170);
+	   fontColorSL = %this.color5;
+	   fontColorNA = %this.SetColorAlpha(%this.color3, 150);
 
-SafeCreateNamedObject("GuiWindowMinButtonProfile", new GuiControlProfile()
-{
-   fillColor = SetColorAlpha($color1, 150);
-   fillColorHL = SetColorAlpha($color4, 150);
-   fillColorSL = AdjustColorValue($color4, 10);
-   fillColorNA = $color1;
+	   borderDefault = GuiWindowButtonBorderProfile;
+	});
 
-   fontColor = SetColorAlpha($color3, 150);
-   fontColorHL = SetColorAlpha($color3, 170);
-   fontColorSL = $color5;
-   fontColorNA = SetColorAlpha($color3, 150);
+	%this.SafeCreateNamedObject("GuiWindowMinButtonProfile", new GuiControlProfile()
+	{
+	   fillColor = %this.SetColorAlpha(%this.color1, 150);
+	   fillColorHL = %this.SetColorAlpha(%this.color4, 150);
+	   fillColorSL = %this.AdjustColorValue(%this.color4, 10);
+	   fillColorNA = %this.color1;
 
-   borderDefault = GuiWindowButtonBorderProfile;
-});
+	   fontColor = %this.SetColorAlpha(%this.color3, 150);
+	   fontColorHL = %this.SetColorAlpha(%this.color3, 170);
+	   fontColorSL = %this.color5;
+	   fontColorNA = %this.SetColorAlpha(%this.color3, 150);
 
-SafeCreateNamedObject("GuiWindowMaxButtonProfile", new GuiControlProfile()
-{
-	fillColor = SetColorAlpha($color1, 150);
-    fillColorHL = SetColorAlpha($color4, 150);
-    fillColorSL = AdjustColorValue($color4, 10);
-    fillColorNA = $color1;
+	   borderDefault = GuiWindowButtonBorderProfile;
+	});
 
-    fontColor = SetColorAlpha($color3, 150);
-    fontColorHL = SetColorAlpha($color3, 170);
-    fontColorSL = $color5;
-    fontColorNA = SetColorAlpha($color3, 150);
+	%this.SafeCreateNamedObject("GuiWindowMaxButtonProfile", new GuiControlProfile()
+	{
+		fillColor = %this.SetColorAlpha(%this.color1, 150);
+	    fillColorHL = %this.SetColorAlpha(%this.color4, 150);
+	    fillColorSL = %this.AdjustColorValue(%this.color4, 10);
+	    fillColorNA = %this.color1;
 
-    borderDefault = GuiWindowButtonBorderProfile;
-});
+	    fontColor = %this.SetColorAlpha(%this.color3, 150);
+	    fontColorHL = %this.SetColorAlpha(%this.color3, 170);
+	    fontColorSL = %this.color5;
+	    fontColorNA = %this.SetColorAlpha(%this.color3, 150);
 
-SafeCreateNamedObject("GuiTransparentProfile", new GuiControlProfile());
+	    borderDefault = GuiWindowButtonBorderProfile;
+	});
 
-SafeCreateNamedObject("GuiGridProfile", new GuiControlProfile());
+	%this.SafeCreateNamedObject("GuiTransparentProfile", new GuiControlProfile());
 
-SafeCreateNamedObject("GuiChainProfile", new GuiControlProfile());
+	%this.SafeCreateNamedObject("GuiGridProfile", new GuiControlProfile());
 
-SafeCreateNamedObject("GuiTabBookProfile", new GuiControlProfile()
-{
-	fillColor = SetColorAlpha($color1, 100);
-	category = "defaultTabBook";
-});
-SafeCreateNamedObject("GuiTabProfile", new GuiControlProfile()
-{
-	fontColor = "255 255 255 255";
-    fontColorHL = "232 240 248 255";
-    fontColorSL= "255 255 255 255";
-    fontColorNA = "0 0 0 255";
-	fillColor = $color1;
-	fillColorHL = AdjustColorValue($color1, 10);
-	fillColorSL = AdjustColorValue($color1, 15);
-	fillColorNA = SetColorAlpha($color1, 100);
-	borderDefault = GuiBrightBorderProfile;
-	align = Center;
-	category = "defaultTab";
-});
-SafeCreateNamedObject("GuiTabPageProfile", new GuiControlProfile()
-{
-	fillColor = $color1;
-	fillColorHL = AdjustColorValue($color1, 10);
-	fillColorSL = AdjustColorValue($color1, 15);
-	fillColorNA = SetColorAlpha($color1, 100);
-	category = "defaultTabPage";
-});
+	%this.SafeCreateNamedObject("GuiChainProfile", new GuiControlProfile());
 
+	%this.SafeCreateNamedObject("GuiTabBookProfile", new GuiControlProfile()
+	{
+		fillColor = %this.SetColorAlpha(%this.color1, 100);
+		category = "defaultTabBook";
+	});
+	%this.SafeCreateNamedObject("GuiTabProfile", new GuiControlProfile()
+	{
+		fontColor = "255 255 255 255";
+	    fontColorHL = "232 240 248 255";
+	    fontColorSL= "255 255 255 255";
+	    fontColorNA = "0 0 0 255";
+		fillColor = %this.color1;
+		fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+		fillColorSL = %this.AdjustColorValue(%this.color1, 15);
+		fillColorNA = %this.SetColorAlpha(%this.color1, 100);
+		borderDefault = GuiBrightBorderProfile;
+		align = Center;
+		category = "defaultTab";
+	});
+	%this.SafeCreateNamedObject("GuiTabPageProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color1;
+		fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+		fillColorSL = %this.AdjustColorValue(%this.color1, 15);
+		fillColorNA = %this.SetColorAlpha(%this.color1, 100);
+		category = "defaultTabPage";
+	});
 
-SafeCreateNamedObject("GuiSpriteProfile", new GuiControlProfile());
 
-SafeCreateNamedObject("GuiTreeViewProfile", new GuiControlProfile()
-{
-	fontColor = "255 255 255 255";
-    fontColorHL = "232 240 248 255";
-    fontColorSL= "255 255 255 255";
-    fontColorNA = "0 0 0 255";
-	fillColor = $color1;
-	fillColorHL = AdjustColorValue($color1, 10);
-	fillColorSL = AdjustColorValue($color1, 15);
-	fillColorNA = SetColorAlpha($color1, 100);
-	bitmap = "./images/treeView";
-	canKeyFocus = true;
-	autoSizeHeight = true;
-});
-
-SafeCreateNamedObject("GuiSolidBorderProfile", new GuiBorderProfile()
-{
-	border = 1;
+	%this.SafeCreateNamedObject("GuiSpriteProfile", new GuiControlProfile());
 
-	padding = 10;
-	paddingHL = 10;
-	paddingSL = 10;
-	paddingNA = 10;
-});
+	%this.SafeCreateNamedObject("GuiTreeViewProfile", new GuiControlProfile()
+	{
+		fontColor = "255 255 255 255";
+	    fontColorHL = "232 240 248 255";
+	    fontColorSL= "255 255 255 255";
+	    fontColorNA = "0 0 0 255";
+		fillColor = %this.color1;
+		fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+		fillColorSL = %this.AdjustColorValue(%this.color1, 15);
+		fillColorNA = %this.SetColorAlpha(%this.color1, 100);
+		bitmap = "./images/treeView";
+		canKeyFocus = true;
+		autoSizeHeight = true;
+	});
+
+	%this.SafeCreateNamedObject("GuiSolidBorderProfile", new GuiBorderProfile()
+	{
+		border = 1;
 
-SafeCreateNamedObject("GuiSolidProfile", new GuiControlProfile()
-{
-	// fill color
-    fillColor = $color1;
-    fillColorHL = AdjustColorValue($color1, 10);
-    fillColorSL = AdjustColorValue($color1, 15);
-    fillColorNA = SetColorAlpha($color1, 100);
+		padding = 10;
+		paddingHL = 10;
+		paddingSL = 10;
+		paddingNA = 10;
+	});
 
-	borderDefault = GuiSolidBorderProfile;
-});
+	%this.SafeCreateNamedObject("GuiSolidProfile", new GuiControlProfile()
+	{
+		// fill color
+	    fillColor = %this.color1;
+	    fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+	    fillColorSL = %this.AdjustColorValue(%this.color1, 15);
+	    fillColorNA = %this.SetColorAlpha(%this.color1, 100);
 
-SafeCreateNamedObject("GuiToolTipProfile", new GuiControlProfile()
-{
-    fillColor = SetColorAlpha($color1, 220);
-	fontColor = $color5;
+		borderDefault = GuiSolidBorderProfile;
+	});
 
-	borderDefault = GuiBrightBorderProfile;
-});
+	%this.SafeCreateNamedObject("GuiToolTipProfile", new GuiControlProfile()
+	{
+	    fillColor = %this.SetColorAlpha(%this.color1, 220);
+		fontColor = %this.color5;
 
-SafeCreateNamedObject("GuiTextProfile", new GuiControlProfile()
-{
-    fontColor = $color3;
+		borderDefault = GuiBrightBorderProfile;
+	});
 
-    align = "left";
-    autoSizeWidth = false;
-    autoSizeHeight = false;
-    returnTab = false;
-    numbersOnly = false;
-    cursorColor = "0 0 0 255";
-});
+	%this.SafeCreateNamedObject("GuiTextProfile", new GuiControlProfile()
+	{
+	    fontColor = %this.color3;
 
-SafeCreateNamedObject("GuiTextArrayProfile", new GuiControlProfile()
-{
-	fontColor = $color3;
+	    align = "left";
+	    autoSizeWidth = false;
+	    autoSizeHeight = false;
+	    returnTab = false;
+	    numbersOnly = false;
+	    cursorColor = "0 0 0 255";
+	});
 
-    align = "left";
-    autoSizeWidth = false;
-    autoSizeHeight = false;
-    returnTab = false;
-    numbersOnly = false;
-    cursorColor = "0 0 0 255";
+	%this.SafeCreateNamedObject("GuiTextArrayProfile", new GuiControlProfile()
+	{
+		fontColor = %this.color3;
 
-   fontColorHL = $color3;
-   fillColorHL = AdjustColorValue($color1, 10);
-});
+	    align = "left";
+	    autoSizeWidth = false;
+	    autoSizeHeight = false;
+	    returnTab = false;
+	    numbersOnly = false;
+	    cursorColor = "0 0 0 255";
 
-SafeCreateNamedObject("GuiTextRightProfile", new GuiControlProfile()
-{
-	fontColor = $color3;
+	   fontColorHL = %this.color3;
+	   fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+	});
 
-    align = "right";
-    autoSizeWidth = false;
-    autoSizeHeight = false;
-    returnTab = false;
-    numbersOnly = false;
-    cursorColor = "0 0 0 255";
-});
+	%this.SafeCreateNamedObject("GuiTextRightProfile", new GuiControlProfile()
+	{
+		fontColor = %this.color3;
 
-SafeCreateNamedObject("GuiCheckBoxProfile", new GuiControlProfile()
-{
-    fillColor = $color3;
-    fillColorHL = AdjustColorValue($color3, -10);
-    fillColorSL = $color4;
-    fillColorNA = SetColorAlpha($color3, 100);
-
-    fontColor = $color3;
-	fontColorHL = AdjustColorValue($color5, -10);
-	fontColorSL = $color5;
-	fontColorNA = SetColorAlpha($color3, 100);
-    align = "left";
-	tab = true;
-
-	borderDefault = "GuiBrightBorderProfile";
-	borderRight = "GuiDarkBorderProfile";
-	borderBottom = "GuiDarkBorderProfile";
-});
-
-SafeCreateNamedObject("GuiTextEditProfile", new GuiControlProfile()
-{
-    fillColor = "232 240 248 255";
-    fillColorHL = "242 250 255 255";
-    fillColorNA = "127 127 127 52";
-	fillColorTextSL = "251 170 0 255";
-    fontColor = "27 59 95 255";
-    fontColorHL = "27 59 95 255";
-    fontColorNA = "0 0 0 52";
-    fontColorSL = "0 0 0 255";
-    textOffset = "5 2";
-    tab = false;
-    canKeyFocus = true;
-    returnTab = true;
-});
-
-SafeCreateNamedObject("GuiScrollTrackProfile", new GuiControlProfile()
-{
-	fillColor = $color1;
-    fillColorHL = $color1;
-    fillColorSL = $color1;
-    fillColorNA = $color1;
-});
+	    align = "right";
+	    autoSizeWidth = false;
+	    autoSizeHeight = false;
+	    returnTab = false;
+	    numbersOnly = false;
+	    cursorColor = "0 0 0 255";
+	});
 
-SafeCreateNamedObject("GuiScrollBrightBorderProfile", new GuiBorderProfile()
-{
-	padding = 3;
-	paddingHL = 2;
-	paddingSL = 2;
-	paddingNA = 3;
+	%this.SafeCreateNamedObject("GuiCheckBoxProfile", new GuiControlProfile()
+	{
+	    fillColor = %this.color3;
+	    fillColorHL = %this.AdjustColorValue(%this.color3, -10);
+	    fillColorSL = %this.color4;
+	    fillColorNA = %this.SetColorAlpha(%this.color3, 100);
+
+	    fontColor = %this.color3;
+		fontColorHL = %this.AdjustColorValue(%this.color5, -10);
+		fontColorSL = %this.color5;
+		fontColorNA = %this.SetColorAlpha(%this.color3, 100);
+	    align = "left";
+		tab = true;
+
+		borderDefault = "GuiBrightBorderProfile";
+		borderRight = "GuiDarkBorderProfile";
+		borderBottom = "GuiDarkBorderProfile";
+	});
+
+	%this.SafeCreateNamedObject("GuiTextEditProfile", new GuiControlProfile()
+	{
+	    fillColor = "232 240 248 255";
+	    fillColorHL = "242 250 255 255";
+	    fillColorNA = "127 127 127 52";
+		fillColorTextSL = "251 170 0 255";
+	    fontColor = "27 59 95 255";
+	    fontColorHL = "27 59 95 255";
+	    fontColorNA = "0 0 0 52";
+	    fontColorSL = "0 0 0 255";
+	    textOffset = "5 2";
+	    tab = false;
+	    canKeyFocus = true;
+	    returnTab = true;
+	});
+
+	%this.SafeCreateNamedObject("GuiScrollTrackProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color1;
+	    fillColorHL = %this.color1;
+	    fillColorSL = %this.color1;
+	    fillColorNA = %this.color1;
+	});
 
-	border = 1;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 1;
+	%this.SafeCreateNamedObject("GuiScrollBrightBorderProfile", new GuiBorderProfile()
+	{
+		padding = 3;
+		paddingHL = 2;
+		paddingSL = 2;
+		paddingNA = 3;
 
-	borderColor = "255 255 255 50";
-	borderColorHL = "255 255 255 50";
-	borderColorSL = "255 255 255 50";
-	borderColorNA = "255 255 255 50";
+		border = 1;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 1;
 
-	underfill = true;
-});
+		borderColor = "255 255 255 50";
+		borderColorHL = "255 255 255 50";
+		borderColorSL = "255 255 255 50";
+		borderColorNA = "255 255 255 50";
 
-SafeCreateNamedObject("GuiScrollDarkBorderProfile", new GuiBorderProfile()
-{
-	padding = 3;
-	paddingHL = 2;
-	paddingSL = 2;
-	paddingNA = 3;
+		underfill = true;
+	});
 
-	border = 1;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 1;
+	%this.SafeCreateNamedObject("GuiScrollDarkBorderProfile", new GuiBorderProfile()
+	{
+		padding = 3;
+		paddingHL = 2;
+		paddingSL = 2;
+		paddingNA = 3;
 
-	borderColor = "0 0 0 20";
-	borderColorHL = "0 0 0 20";
-	borderColorSL = "0 0 0 20";
-	borderColorNA = "0 0 0 20";
+		border = 1;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 1;
 
-	underfill = true;
-});
+		borderColor = "0 0 0 20";
+		borderColorHL = "0 0 0 20";
+		borderColorSL = "0 0 0 20";
+		borderColorNA = "0 0 0 20";
 
-SafeCreateNamedObject("GuiScrollThumbProfile", new GuiControlProfile()
-{
-	fillColor = $color3;
-    fillColorHL = AdjustColorValue($color3, 10);
-    fillColorSL = $color4;
-    fillColorNA = SetColorAlpha($color3, 100);
+		underfill = true;
+	});
 
-	borderDefault = GuiScrollBrightBorderProfile;
-	borderRight = GuiScrollDarkBorderProfile;
-	borderBottom = GuiScrollDarkBorderProfile;
-});
+	%this.SafeCreateNamedObject("GuiScrollThumbProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color3;
+	    fillColorHL = %this.AdjustColorValue(%this.color3, 10);
+	    fillColorSL = %this.color4;
+	    fillColorNA = %this.SetColorAlpha(%this.color3, 100);
 
-SafeCreateNamedObject("GuiScrollArrowProfile", new GuiControlProfile()
-{
-	fillColor = $color3;
-    fillColorHL = AdjustColorValue($color3, 10);
-    fillColorSL = $color4;
-    fillColorNA = SetColorAlpha($color3, 100);
-
-	fontColor = "0 0 0 100";
-    fontColorHL = "0 0 0 150";
-    fontColorSL = $color5;
-    fontColorNA = "0 0 0 50";
-
-	borderDefault = GuiScrollBrightBorderProfile;
-	borderRight = GuiScrollDarkBorderProfile;
-	borderBottom = GuiScrollDarkBorderProfile;
-});
-
-SafeCreateNamedObject("GuiScrollProfile", new GuiControlProfile()
-{
-    fillColor = $color2;
-    borderDefault = GuiDefaultBorderProfile;
-});
+		borderDefault = GuiScrollBrightBorderProfile;
+		borderRight = GuiScrollDarkBorderProfile;
+		borderBottom = GuiScrollDarkBorderProfile;
+	});
 
-SafeCreateNamedObject("GuiTransparentScrollProfile", new GuiControlProfile()
-{
-   fillColor = "255 255 255 0";
-   fillColor = $color2;
-   borderDefault = GuiDefaultBorderProfile;
-});
+	%this.SafeCreateNamedObject("GuiScrollArrowProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color3;
+	    fillColorHL = %this.AdjustColorValue(%this.color3, 10);
+	    fillColorSL = %this.color4;
+	    fillColorNA = %this.SetColorAlpha(%this.color3, 100);
+
+		fontColor = "0 0 0 100";
+	    fontColorHL = "0 0 0 150";
+	    fontColorSL = %this.color5;
+	    fontColorNA = "0 0 0 50";
+
+		borderDefault = GuiScrollBrightBorderProfile;
+		borderRight = GuiScrollDarkBorderProfile;
+		borderBottom = GuiScrollDarkBorderProfile;
+	});
+
+	%this.SafeCreateNamedObject("GuiScrollProfile", new GuiControlProfile()
+	{
+	    fillColor = %this.color2;
+	    borderDefault = GuiDefaultBorderProfile;
+	});
 
-SafeCreateNamedObject("GuiDarkButtonBorderProfile", new GuiBorderProfile()
-{
-	padding = 4;
-	paddingHL = 4;
-	paddingSL = 4;
-	paddingNA = 4;
+	%this.SafeCreateNamedObject("GuiTransparentScrollProfile", new GuiControlProfile()
+	{
+	   fillColor = "255 255 255 0";
+	   fillColor = %this.color2;
+	   borderDefault = GuiDefaultBorderProfile;
+	});
 
-	border = 3;
-	borderHL = 3;
-	borderSL = 3;
-	borderNA = 3;
+	%this.SafeCreateNamedObject("GuiDarkButtonBorderProfile", new GuiBorderProfile()
+	{
+		padding = 4;
+		paddingHL = 4;
+		paddingSL = 4;
+		paddingNA = 4;
 
-	borderColor = "0 0 0 50";
-	borderColorHL = "0 0 0 50";
-	borderColorSL = "0 0 0 50";
-	borderColorNA = "0 0 0 50";
+		border = 3;
+		borderHL = 3;
+		borderSL = 3;
+		borderNA = 3;
 
-	underfill = true;
-});
+		borderColor = "0 0 0 50";
+		borderColorHL = "0 0 0 50";
+		borderColorSL = "0 0 0 50";
+		borderColorNA = "0 0 0 50";
 
-SafeCreateNamedObject("GuiBrightButtonBorderProfile", new GuiBorderProfile()
-{
-	padding = 4;
-	paddingHL = 4;
-	paddingSL = 4;
-	paddingNA = 4;
+		underfill = true;
+	});
 
-	border = 3;
-	borderHL = 3;
-	borderSL = 3;
-	borderNA = 3;
+	%this.SafeCreateNamedObject("GuiBrightButtonBorderProfile", new GuiBorderProfile()
+	{
+		padding = 4;
+		paddingHL = 4;
+		paddingSL = 4;
+		paddingNA = 4;
 
-	borderColor = "255 255 255 50";
-	borderColorHL = "255 255 255 50";
-	borderColorSL = "255 255 255 50";
-	borderColorNA = "255 255 255 50";
+		border = 3;
+		borderHL = 3;
+		borderSL = 3;
+		borderNA = 3;
 
-	underfill = true;
-});
+		borderColor = "255 255 255 50";
+		borderColorHL = "255 255 255 50";
+		borderColorSL = "255 255 255 50";
+		borderColorNA = "255 255 255 50";
 
-SafeCreateNamedObject("GuiButtonProfile", new GuiControlProfile()
-{
-	fillColor = $color3;
-	fillColorHL = AdjustColorValue($color3, 10);
-	fillColorSL = AdjustColorValue($color3, 15);
-	fillColorNA = SetColorAlpha($color3, 80);
-
-	fontColor = $color1;
-	fontColorHL = $color4;
-	fontColorSL = $color1;
-	fontColorNA = SetColorAlpha($color1, 100);
-	align = center;
-	vAlign = middle;
-
-	borderLeft = GuiBrightButtonBorderProfile;
-	borderRight = GuiDarkButtonBorderProfile;
-	borderTop = GuiBrightButtonBorderProfile;
-	borderBottom = GuiDarkButtonBorderProfile;
-
-	canKeyFocus = true;
-	tab = true;
-});
-
-SafeCreateNamedObject("GuiRadioProfile", new GuiControlProfile()
-{
-	fillColor = $color3;
-    fillColorHL = AdjustColorValue($color3, -10);
-    fillColorSL = $color4;
-    fillColorNA = SetColorAlpha($color3, 100);
-
-    fontColor = $color3;
-	fontColorHL = AdjustColorValue($color5, -10);
-	fontColorSL = $color5;
-	fontColorNA = SetColorAlpha($color3, 100);
-    align = "left";
-	tab = true;
-
-	borderLeft = GuiBrightButtonBorderProfile;
-	borderRight = GuiDarkButtonBorderProfile;
-	borderTop = GuiBrightButtonBorderProfile;
-	borderBottom = GuiDarkButtonBorderProfile;
-
-	canKeyFocus = true;
-	tab = true;
-});
-
-SafeCreateNamedObject("GuiHeaderProfile", new GuiControlProfile()
-{
-    fillColor = $color2;
-    fillColorHL = AdjustColorValue($color1, 10);
-    fillColorSL = AdjustColorValue($color1, 15);
-    fillColorNA = SetColorAlpha($color1, 100);
+		underfill = true;
+	});
+
+	%this.SafeCreateNamedObject("GuiButtonProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color3;
+		fillColorHL = %this.AdjustColorValue(%this.color3, 10);
+		fillColorSL = %this.AdjustColorValue(%this.color3, 15);
+		fillColorNA = %this.SetColorAlpha(%this.color3, 80);
+
+		fontColor = %this.color1;
+		fontColorHL = %this.color4;
+		fontColorSL = %this.color1;
+		fontColorNA = %this.SetColorAlpha(%this.color1, 100);
+		align = center;
+		vAlign = middle;
+
+		borderLeft = GuiBrightButtonBorderProfile;
+		borderRight = GuiDarkButtonBorderProfile;
+		borderTop = GuiBrightButtonBorderProfile;
+		borderBottom = GuiDarkButtonBorderProfile;
+
+		canKeyFocus = true;
+		tab = true;
+	});
+
+	%this.SafeCreateNamedObject("GuiRadioProfile", new GuiControlProfile()
+	{
+		fillColor = %this.color3;
+	    fillColorHL = %this.AdjustColorValue(%this.color3, -10);
+	    fillColorSL = %this.color4;
+	    fillColorNA = %this.SetColorAlpha(%this.color3, 100);
+
+	    fontColor = %this.color3;
+		fontColorHL = %this.AdjustColorValue(%this.color5, -10);
+		fontColorSL = %this.color5;
+		fontColorNA = %this.SetColorAlpha(%this.color3, 100);
+	    align = "left";
+		tab = true;
+
+		borderLeft = GuiBrightButtonBorderProfile;
+		borderRight = GuiDarkButtonBorderProfile;
+		borderTop = GuiBrightButtonBorderProfile;
+		borderBottom = GuiDarkButtonBorderProfile;
+
+		canKeyFocus = true;
+		tab = true;
+	});
+
+	%this.SafeCreateNamedObject("GuiHeaderProfile", new GuiControlProfile()
+	{
+	    fillColor = %this.color2;
+	    fillColorHL = %this.AdjustColorValue(%this.color1, 10);
+	    fillColorSL = %this.AdjustColorValue(%this.color1, 15);
+	    fillColorNA = %this.SetColorAlpha(%this.color1, 100);
 
-	fontColor = $color3;
-	fontSize = $platformFontSize + 2;
-	align = "left";
+		fontColor = %this.color3;
+		fontSize = %this.platformFontSize + 2;
+		align = "left";
 
-	borderDefault = "GuiBrightBorderProfile";
-	borderRight = "GuiDarkBorderProfile";
-	borderBottom = "GuiDarkBorderProfile";
-});
+		borderDefault = "GuiBrightBorderProfile";
+		borderRight = "GuiDarkBorderProfile";
+		borderBottom = "GuiDarkBorderProfile";
+	});
 
-SafeCreateNamedObject("GuiLabelProfile", new GuiControlProfile()
-{
-	fontColor = "255 255 255 255";
-	fontSize = $platformFontSize;
-	align = "left";
-});
+	%this.SafeCreateNamedObject("GuiLabelProfile", new GuiControlProfile()
+	{
+		fontColor = "255 255 255 255";
+		fontSize = %this.platformFontSize;
+		align = "left";
+	});
 
-SafeCreateNamedObject("GuiDragAndDropProfile", new GuiControlProfile()
-{
-   fillColor = SetColorAlpha($color4, 50);
-   fontColor = $color5;
-});
+	%this.SafeCreateNamedObject("GuiDragAndDropProfile", new GuiControlProfile()
+	{
+	   fillColor = %this.SetColorAlpha(%this.color4, 50);
+	   fontColor = %this.color5;
+	});
 
-SafeCreateNamedObject("GuiProgressBorderProfile", new GuiBorderProfile()
-{
-	padding = 2;
-	paddingHL = 0;
-	paddingSL = 0;
+	%this.SafeCreateNamedObject("GuiProgressBorderProfile", new GuiBorderProfile()
+	{
+		padding = 2;
+		paddingHL = 0;
+		paddingSL = 0;
 
-	border = 2;
-	borderHL = 2;
-	borderSL = 2;
+		border = 2;
+		borderHL = 2;
+		borderSL = 2;
 
-	margin = 0;
-	marginHL = 3;
-	marginSL = 3;
+		margin = 0;
+		marginHL = 3;
+		marginSL = 3;
 
-	borderColor = AdjustColorValue($color1, -10);
-	borderColorHL = "255 255 255 50";
-	borderColorSL = "255 255 255 50";
-});
+		borderColor = %this.AdjustColorValue(%this.color1, -10);
+		borderColorHL = "255 255 255 50";
+		borderColorSL = "255 255 255 50";
+	});
 
-SafeCreateNamedObject("GuiProgressDarkBorderProfile", new GuiBorderProfile()
-{
-	padding = 2;
-	paddingHL = 0;
-	paddingSL = 0;
+	%this.SafeCreateNamedObject("GuiProgressDarkBorderProfile", new GuiBorderProfile()
+	{
+		padding = 2;
+		paddingHL = 0;
+		paddingSL = 0;
 
-	border = 2;
-	borderHL = 2;
-	borderSL = 2;
+		border = 2;
+		borderHL = 2;
+		borderSL = 2;
 
-	margin = 0;
-	marginHL = 3;
-	marginSL = 3;
+		margin = 0;
+		marginHL = 3;
+		marginSL = 3;
 
-	borderColor = AdjustColorValue($color1, -10);
-	borderColorHL = "0 0 0 50";
-	borderColorSL = "0 0 0 50";
-});
+		borderColor = %this.AdjustColorValue(%this.color1, -10);
+		borderColorHL = "0 0 0 50";
+		borderColorSL = "0 0 0 50";
+	});
 
-SafeCreateNamedObject("GuiProgressProfile", new GuiControlProfile()
-{
-   fillColor = $color1;
-   fillColorHL = $color4;
-   fillColorSL = AdjustColorValue($color4, 10);
+	%this.SafeCreateNamedObject("GuiProgressProfile", new GuiControlProfile()
+	{
+	   fillColor = %this.color1;
+	   fillColorHL = %this.color4;
+	   fillColorSL = %this.AdjustColorValue(%this.color4, 10);
 
-   fontColorHL = $color3;
-   fontColorSL = $color5;
+	   fontColorHL = %this.color3;
+	   fontColorSL = %this.color5;
 
-   borderDefault = GuiProgressBorderProfile;
-   borderBottom = GuiProgressDarkBorderProfile;
-   borderRight = GuiProgressDarkBorderProfile;
-});
+	   borderDefault = GuiProgressBorderProfile;
+	   borderBottom = GuiProgressDarkBorderProfile;
+	   borderRight = GuiProgressDarkBorderProfile;
+	});
 
-SafeCreateNamedObject("GuiDropDownDarkBorderProfile", new GuiBorderProfile()
-{
-	padding = 4;
-	paddingHL = 4;
-	paddingSL = 4;
-	paddingNA = 4;
+	%this.SafeCreateNamedObject("GuiDropDownDarkBorderProfile", new GuiBorderProfile()
+	{
+		padding = 4;
+		paddingHL = 4;
+		paddingSL = 4;
+		paddingNA = 4;
 
-	border = 2;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 2;
+		border = 2;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 2;
 
-	borderColor = "0 0 0 50";
-	borderColorHL = "0 0 0 50";
-	borderColorSL = "0 0 0 50";
-	borderColorNA = "0 0 0 50";
+		borderColor = "0 0 0 50";
+		borderColorHL = "0 0 0 50";
+		borderColorSL = "0 0 0 50";
+		borderColorNA = "0 0 0 50";
 
-	underfill = true;
-});
+		underfill = true;
+	});
 
-SafeCreateNamedObject("GuiDropDownBrightBorderProfile", new GuiBorderProfile()
-{
-	padding = 4;
-	paddingHL = 4;
-	paddingSL = 4;
-	paddingNA = 4;
+	%this.SafeCreateNamedObject("GuiDropDownBrightBorderProfile", new GuiBorderProfile()
+	{
+		padding = 4;
+		paddingHL = 4;
+		paddingSL = 4;
+		paddingNA = 4;
 
-	border = 2;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 2;
+		border = 2;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 2;
 
-	borderColor = "255 255 255 50";
-	borderColorHL = "255 255 255 50";
-	borderColorSL = "255 255 255 50";
-	borderColorNA = "255 255 255 50";
+		borderColor = "255 255 255 50";
+		borderColorHL = "255 255 255 50";
+		borderColorSL = "255 255 255 50";
+		borderColorNA = "255 255 255 50";
 
-	underfill = true;
-});
+		underfill = true;
+	});
 
-SafeCreateNamedObject("GuiDropDownProfile", new GuiControlProfile()
-{
-    // fill color
-    fillColor = AdjustColorValue($color3, -15);
-	fillColorHL = AdjustColorValue($color3, -8);
-	fillColorSL = $color4;
-	fillColorNA = SetColorAlpha($color3, 100);
-
-    fontColor = $color1;
-	fontColorHL = $color1;
-	fontColorSL = $color3;
-	fontColorNA = SetColorAlpha($color1, 100);
-	align = "left";
-
-	tab = true;
-	canKeyFocus = true;
-
-	borderDefault = GuiDropDownBrightBorderProfile;
-	borderRight = GuiDropDownDarkBorderProfile;
-	borderBottom = GuiDropDownDarkBorderProfile;
-	category = "dropDown";
-});
-
-SafeCreateNamedObject("GuiMenuBarBorderProfile", new GuiBorderProfile()
-{
-	padding = 2;
-});
+	%this.SafeCreateNamedObject("GuiDropDownProfile", new GuiControlProfile()
+	{
+	    // fill color
+	    fillColor = %this.AdjustColorValue(%this.color3, -15);
+		fillColorHL = %this.AdjustColorValue(%this.color3, -8);
+		fillColorSL = %this.color4;
+		fillColorNA = %this.SetColorAlpha(%this.color3, 100);
+
+	    fontColor = %this.color1;
+		fontColorHL = %this.color1;
+		fontColorSL = %this.color3;
+		fontColorNA = %this.SetColorAlpha(%this.color1, 100);
+		align = "left";
+
+		tab = true;
+		canKeyFocus = true;
+
+		borderDefault = GuiDropDownBrightBorderProfile;
+		borderRight = GuiDropDownDarkBorderProfile;
+		borderBottom = GuiDropDownDarkBorderProfile;
+		category = "dropDown";
+	});
+
+	%this.SafeCreateNamedObject("GuiMenuBarBorderProfile", new GuiBorderProfile()
+	{
+		padding = 2;
+	});
 
-SafeCreateNamedObject("GuiMenuBarProfile", new GuiControlProfile()
-{
-	fillColor = AdjustColorValue($color1, -7);
-	canKeyFocus = true;
-	borderDefault = GuiMenuBarBorderProfile;
-	category = "defaultMenuBar";
-});
+	%this.SafeCreateNamedObject("GuiMenuBarProfile", new GuiControlProfile()
+	{
+		fillColor = %this.AdjustColorValue(%this.color1, -7);
+		canKeyFocus = true;
+		borderDefault = GuiMenuBarBorderProfile;
+		category = "defaultMenuBar";
+	});
 
-SafeCreateNamedObject("GuiMenuBorderProfile", new GuiBorderProfile()
-{
-	margin = 2;
-	marginHL = 0;
-	marginSL = 0;
-	marginNA = 2;
+	%this.SafeCreateNamedObject("GuiMenuBorderProfile", new GuiBorderProfile()
+	{
+		margin = 2;
+		marginHL = 0;
+		marginSL = 0;
+		marginNA = 2;
 
-	border = 0;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 0;
+		border = 0;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 0;
 
-	borderColorHL = "255 255 255 30";
-	borderColorSL = $color4;
-});
+		borderColorHL = "255 255 255 30";
+		borderColorSL = %this.color4;
+	});
 
-SafeCreateNamedObject("GuiMenuBottomBorderProfile", new GuiBorderProfile()
-{
-	fillColor = AdjustColorValue($color1, -7);
-	canKeyFocus = true;
-	borderDefault = GuiMenuBarBorderProfile;
-	category = "defaultMenuBar";
+	%this.SafeCreateNamedObject("GuiMenuBottomBorderProfile", new GuiBorderProfile()
+	{
+		fillColor = %this.AdjustColorValue(%this.color1, -7);
+		canKeyFocus = true;
+		borderDefault = GuiMenuBarBorderProfile;
+		category = "defaultMenuBar";
 
-	paddingSL = 2;
-	marginSL = 0;
-	borderSL = 0;
-});
+		paddingSL = 2;
+		marginSL = 0;
+		borderSL = 0;
+	});
 
-SafeCreateNamedObject("GuiMenuSideBorderProfile", new GuiBorderProfile()
-{
-	border = 0;
-	borderHL = 2;
-	borderSL = 2;
-	borderNA = 0;
+	%this.SafeCreateNamedObject("GuiMenuSideBorderProfile", new GuiBorderProfile()
+	{
+		border = 0;
+		borderHL = 2;
+		borderSL = 2;
+		borderNA = 0;
 
-	padding = 10;
-	paddingHL = 8;
-	paddingSL = 8;
-	paddingNA = 10;
+		padding = 10;
+		paddingHL = 8;
+		paddingSL = 8;
+		paddingNA = 10;
 
-	borderColorHL = "255 255 255 30";
-	borderColorSL = $color4;
-});
+		borderColorHL = "255 255 255 30";
+		borderColorSL = %this.color4;
+	});
 
-SafeCreateNamedObject("GuiMenuProfile", new GuiControlProfile()
-{
-	fillColor = "0 0 0 0";
-	fillColorHL = "255 255 255 10";
-	fillColorSL = AdjustColorValue($color4, -15);
-	fillColorNA = "0 0 0 0";
-
-	borderDefault = GuiMenuBorderProfile;
-	borderLeft = GuiMenuSideBorderProfile;
-	borderRight = GuiMenuSideBorderProfile;
-	borderBottom = GuiMenuBottomBorderProfile;
-	category = "defaultMenuBar";
-
-	fontColor = $color3;
-	fontColorHL = AdjustColorValue($color3, 10);
-	fontColorSL = $color3;
-	fontColorNA = SetColorAlpha($color3, 100);
-});
-
-SafeCreateNamedObject("GuiMenuContentVertBorderProfile", new GuiBorderProfile()
-{
-	border = 2;
-	padding = 4;
-	borderColor = $color4;
-});
+	%this.SafeCreateNamedObject("GuiMenuProfile", new GuiControlProfile()
+	{
+		fillColor = "0 0 0 0";
+		fillColorHL = "255 255 255 10";
+		fillColorSL = %this.AdjustColorValue(%this.color4, -15);
+		fillColorNA = "0 0 0 0";
+
+		borderDefault = GuiMenuBorderProfile;
+		borderLeft = GuiMenuSideBorderProfile;
+		borderRight = GuiMenuSideBorderProfile;
+		borderBottom = GuiMenuBottomBorderProfile;
+		category = "defaultMenuBar";
+
+		fontColor = %this.color3;
+		fontColorHL = %this.AdjustColorValue(%this.color3, 10);
+		fontColorSL = %this.color3;
+		fontColorNA = %this.SetColorAlpha(%this.color3, 100);
+	});
+
+	%this.SafeCreateNamedObject("GuiMenuContentVertBorderProfile", new GuiBorderProfile()
+	{
+		border = 2;
+		padding = 4;
+		borderColor = %this.color4;
+	});
 
-SafeCreateNamedObject("GuiMenuContentSideBorderProfile", new GuiBorderProfile()
-{
-	border = 2;
-	padding = 0;
-	borderColor = $color4;
-});
+	%this.SafeCreateNamedObject("GuiMenuContentSideBorderProfile", new GuiBorderProfile()
+	{
+		border = 2;
+		padding = 0;
+		borderColor = %this.color4;
+	});
 
-SafeCreateNamedObject("GuiMenuContentProfile", new GuiControlProfile()
-{
-	fillColor = AdjustColorValue($color1, -5);
+	%this.SafeCreateNamedObject("GuiMenuContentProfile", new GuiControlProfile()
+	{
+		fillColor = %this.AdjustColorValue(%this.color1, -5);
 
-	borderDefault = GuiMenuContentSideBorderProfile;
-	borderTop = GuiMenuContentVertBorderProfile;
-	borderBottom = GuiMenuContentVertBorderProfile;
-});
+		borderDefault = GuiMenuContentSideBorderProfile;
+		borderTop = GuiMenuContentVertBorderProfile;
+		borderBottom = GuiMenuContentVertBorderProfile;
+	});
 
-SafeCreateNamedObject("GuiMenuItemBorderTopProfile", new GuiBorderProfile()
-{
-	padding = 6;
-	paddingHL = 6;
-	paddingSL = 0;
-	paddingNA = 6;
+	%this.SafeCreateNamedObject("GuiMenuItemBorderTopProfile", new GuiBorderProfile()
+	{
+		padding = 6;
+		paddingHL = 6;
+		paddingSL = 0;
+		paddingNA = 6;
 
-	marginSL = 4;
-	borderSL = 1;
-	borderColorSL = "0 0 0 50";
-});
+		marginSL = 4;
+		borderSL = 1;
+		borderColorSL = "0 0 0 50";
+	});
 
-SafeCreateNamedObject("GuiMenuItemBorderBottomProfile", new GuiBorderProfile()
-{
-	padding = 6;
-	paddingHL = 6;
-	paddingSL = 0;
-	paddingNA = 6;
+	%this.SafeCreateNamedObject("GuiMenuItemBorderBottomProfile", new GuiBorderProfile()
+	{
+		padding = 6;
+		paddingHL = 6;
+		paddingSL = 0;
+		paddingNA = 6;
 
-	marginSL = 4;
-	borderSL = 1;
-	borderColorSL = "255 255 255 50";
-});
+		marginSL = 4;
+		borderSL = 1;
+		borderColorSL = "255 255 255 50";
+	});
 
-SafeCreateNamedObject("GuiMenuItemBorderSideProfile", new GuiBorderProfile()
-{
-	padding = 6;
-	paddingHL = 6;
-	paddingSL = 0;
-	paddingNA = 6;
+	%this.SafeCreateNamedObject("GuiMenuItemBorderSideProfile", new GuiBorderProfile()
+	{
+		padding = 6;
+		paddingHL = 6;
+		paddingSL = 0;
+		paddingNA = 6;
 
-	marginSL = 0;
-	borderSL = 0;
-	paddingSL = 6;
-});
+		marginSL = 0;
+		borderSL = 0;
+		paddingSL = 6;
+	});
 
-SafeCreateNamedObject("GuiMenuItemProfile", new GuiControlProfile()
-{
-	fillColor = AdjustColorValue($color1, -5);
-	fillColorHL = AdjustColorValue($color4, -15);
-	fillColorNA = $color1;
-	align = left;
-
-	fontColor = $color3;
-	fontColorHL = AdjustColorValue($color3, 10);
-	fontColorNA = SetColorAlpha($color3, 150);
-
-	borderDefault = GuiMenuItemBorderSideProfile;
-	borderTop = GuiMenuItemBorderTopProfile;
-	borderBottom = GuiMenuItemBorderBottomProfile;
-});
+	%this.SafeCreateNamedObject("GuiMenuItemProfile", new GuiControlProfile()
+	{
+		fillColor = %this.AdjustColorValue(%this.color1, -5);
+		fillColorHL = %this.AdjustColorValue(%this.color4, -15);
+		fillColorNA = %this.color1;
+		align = left;
+
+		fontColor = %this.color3;
+		fontColorHL = %this.AdjustColorValue(%this.color3, 10);
+		fontColorNA = %this.SetColorAlpha(%this.color3, 150);
+
+		borderDefault = GuiMenuItemBorderSideProfile;
+		borderTop = GuiMenuItemBorderTopProfile;
+		borderBottom = GuiMenuItemBorderBottomProfile;
+	});
+}

library/AppCore/module.taml

@@ -1,6 +1,7 @@
 <ModuleDefinition
 	ModuleId="AppCore"
 	VersionId="1"
+	BuildID="1"
 	Description="Provides critical initialization and functionality needed for every project."
 	ScriptFile="appCore.cs"
 	CreateFunction="create"

library/Audio/audio.cs

@@ -48,7 +48,7 @@ function Audio::StopAllAndPlayMusic(%this, %song)
         if(%this.MusicOn)
         {
             cancel(%this.fadeMusicSchedule);
-            %this.Music = alxPlay("Audio:" @ %song);
+            %this.Music = alxPlay(%song);
         }
     }
 }
@@ -62,7 +62,7 @@ function Audio::PlayMusic(%this, %song)
       {
          cancel(%this.fadeMusicSchedule);
          alxStop(%this.Music);
-         %this.Music = alxPlay("Audio:" @ %song);
+         %this.Music = alxPlay(%song);
       }
    }
 }
@@ -71,7 +71,7 @@ function Audio::RestartMusic(%this)
 {
 	cancel(%this.fadeMusicSchedule);
 	alxStop(%this.Music);
-	%this.Music = alxPlay("Audio:" @ %this.CurrentSong);
+	%this.Music = alxPlay(%this.CurrentSong);
 }
 
 function Audio::StopMusic(%this)
@@ -83,7 +83,7 @@ function Audio::PlaySound(%this, %name)
 {
     if(%this.SoundOn)
     {
-        %sound = alxPlay("Audio:" @ %name);
+        %sound = alxPlay(%name);
     }
 
     return %sound;

library/Audio/module.taml

@@ -1,19 +1,10 @@
 <ModuleDefinition
 	ModuleId="Audio"
 	VersionId="1"
-	Dependencies="AppCore=1"
+	BuildID="1"
 	Synchronized="1"
-    Group="gameBase"
 	Description="Provides basic audio functionality for music and sound effects."
 	ScriptFile="audio.cs"
 	CreateFunction="create"
 	DestroyFunction="destroy">
-		<DeclaredAssets
-			Path="music"
-			Extension="audio.taml"
-			Recurse="true"/>
-		<DeclaredAssets
-			Path="sound"
-			Extension="audio.taml"
-			Recurse="true"/>
 </ModuleDefinition>

library/BlankGame/game.cs

@@ -0,0 +1,14 @@
+
+function BlankGame::create(%this)
+{
+	// Put a gui in the Canvas
+	Canvas.setContent(TamlRead("./gui/defaultGui.gui.taml"));
+
+	// Play Music
+	Audio.PlayMusic("BlankGame:planetfall");
+}
+
+function BlankGame::destroy(%this)
+{
+
+}

library/AppCore/gui/defaultGui.gui.taml → library/BlankGame/gui/defaultGui.gui.taml

@@ -5,7 +5,7 @@
 	VertSizing = "relative"
 	Position = "0 0"
 	Extent = "1024 768"
-	Image = "AppCore:torqueBG"
+	Image = "BlankGame:torqueBG"
 	SingleFrameBitmap = "1"
 	TileImage = "0"
 	FullSize = "1"

library/BlankGame/module.taml

@@ -0,0 +1,36 @@
+<ModuleDefinition
+	ModuleId="BlankGame"
+	VersionId="1"
+	BuildID="1"
+	Type="Template"
+	Description="A blank game, ready for you to craft into something amazing!"
+	Author="Torque2D"
+	ScriptFile="game.cs"
+	CreateFunction="create"
+	DestroyFunction="destroy"
+	Dependencies="Audio=1">
+		<DeclaredAssets
+			Path="sprites"
+			Extension="asset.taml"
+			Recurse="true"/>
+		<DeclaredAssets
+			Path="gui"
+			Extension="asset.taml"
+			Recurse="true"/>
+		<DeclaredAssets
+			Path="fonts"
+			Extension="font.taml"
+			Recurse="true"/>
+		<DeclaredAssets
+			Path="particles"
+			Extension="asset.taml"
+			Recurse="true"/>
+		<DeclaredAssets
+			Path="music"
+			Extension="audio.taml"
+			Recurse="true"/>
+		<DeclaredAssets
+			Path="sound"
+			Extension="audio.taml"
+			Recurse="true"/>
+</ModuleDefinition>