diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7bf7eac52..dd4cd7aef 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -31,7 +31,7 @@
   "xml.format.legacy": false,
   "xml.format.emptyElements": "collapse",
   "xml.preferences.quoteStyle": "double",
-  "xml.format.enforceQuoteStyle": "preferred",l
+  "xml.format.enforceQuoteStyle": "preferred",
   "xml.format.preserveAttributeLineBreaks": false,
   "xml.format.preservedNewlines": 0,
   "xml.format.splitAttributes": false,
diff --git a/Project.xml b/Project.xml
index 972749939..f51834b9f 100644
--- a/Project.xml
+++ b/Project.xml
@@ -1,48 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
-
 	<app title="Friday Night Funkin'" file="Funkin" packageName="com.funkin.fnf" package="com.funkin.fnf" main="Main" version="0.3.0" company="ninjamuffin99" />
-
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
-
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
 	<!-- <app preloader="Preloader" resizable="true" /> -->
 	<app preloader="Preloader" />
-
 	<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
 	<set name="SWF_VERSION" value="11.8" />
-
 	<!-- ____________________________ Window Settings ___________________________ -->
-
 	<!--These window settings apply to all targets-->
 	<window width="1280" height="720" fps="" background="#000000" hardware="true" vsync="false" />
-
 	<!--HTML5-specific-->
 	<window if="html5" resizable="true" />
-
 	<!--Desktop-specific-->
 	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false" />
-
 	<!--Mobile-specific-->
 	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false" />
-
 	<!-- _____________________________ Path Settings ____________________________ -->
-
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 	<set name="BUILD_DIR" value="export/32bit" if="32bit" />
-
 	<classpath name="source" />
-
 	<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web" />
 	<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web" />
-
 	<define name="PRELOAD_ALL" unless="web" />
 	<define name="NO_PRELOAD_ALL" unless="PRELOAD_ALL" />
-
 	<section if="PRELOAD_ALL">
 		<library name="songs" preload="true" />
 		<library name="shared" preload="true" />
@@ -56,7 +41,6 @@
 		<library name="week7" preload="true" />
 		<library name="weekend1" preload="true" />
 	</section>
-
 	<section if="NO_PRELOAD_ALL">
 		<library name="songs" preload="false" />
 		<library name="shared" preload="false" />
@@ -70,7 +54,6 @@
 		<library name="week7" preload="false" />
 		<library name="weekend1" preload="false" />
 	</section>
-
 	<assets path="assets/songs" library="songs" exclude="*.fla|*.ogg" if="web" />
 	<assets path="assets/songs" library="songs" exclude="*.fla|*.mp3" unless="web" />
 	<assets path="assets/shared" library="shared" exclude="*.fla|*.ogg" if="web" />
@@ -93,9 +76,7 @@
 	<assets path="assets/week7" library="week7" exclude="*.fla|*.mp3" unless="web" />
 	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.ogg" if="web" />
 	<assets path="assets/weekend1" library="weekend1" exclude="*.fla|*.mp3" unless="web" />
-
 	<!-- <assets path='example_mods' rename='mods' embed='false'/> -->
-
 	<!--
 		AUTOMATICALLY MOVING EXAMPLE MODS INTO THE BUILD CAUSES ISSUES
 		Currently, this line will add the mod files to the library manifest,
@@ -103,131 +84,95 @@
 		If we can exclude the `mods` folder from the manifest, we can re-enable this line.
 		<assets path='example_mods' rename='mods' embed='false' exclude="*.md" />
 	-->
-	<assets path='art/readme.txt' rename='do NOT readme.txt' />
-
-	<assets path="CHANGELOG.md" rename='changelog.txt' />
-
-	<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY 
+	<assets path="art/readme.txt" rename="do NOT readme.txt" />
+	<assets path="CHANGELOG.md" rename="changelog.txt" />
+	<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY
 		TO FIX ONE OF THEM, I CONVERTED IT TO OTF. DUNNO IF YOU NEED TO
 		THEN UHHH I USED THE NAME OF THE FONT WITH SETFORMAT() ON THE TEXT!!!
 		NOT USING A DIRECT THING TO THE ASSET!!!
 	-->
-	<assets path="assets/fonts" embed='true' />
+	<assets path="assets/fonts" embed="true" />
 	<!-- _______________________________ Libraries ______________________________ -->
-
 	<haxelib name="lime" /> <!-- Game engine backend -->
 	<haxelib name="openfl" /> <!-- Game engine backend -->
 	<haxelib name="flixel" /> <!-- Game engine -->
-	<haxedev set='webgl' />
-
+	<haxedev set="webgl" />
 	<!--In case you want to use the addons package-->
 	<haxelib name="flixel-addons" /> <!-- Additional utilities for Flixel -->
 	<haxelib name="hscript" /> <!-- Scripting -->
-
 	<haxelib name="flixel-ui" /> <!-- UI framework (deprecate this? -->
-	<haxelib name="haxeui-core"/> <!-- UI framework -->
-	<haxelib name="haxeui-flixel"/> <!-- Integrate HaxeUI with Flixel -->
+	<haxelib name="haxeui-core" /> <!-- UI framework -->
+	<haxelib name="haxeui-flixel" /> <!-- Integrate HaxeUI with Flixel -->
 	<haxelib name="polymod" /> <!-- Modding framework -->
 	<haxelib name="flxanimate" /> <!-- Texture atlas rendering -->
 	<!-- <haxelib name="hxcodec" /> Video playback -->
 	<haxelib name="json2object" /> <!-- JSON parsing -->
-
 	<haxelib name="thx.semver" />
-
 	<haxelib name="hxcpp-debug-server" if="desktop debug" />
-
 	<!--Disable the Flixel core focus lost screen-->
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
-
 	<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
 	<haxedef name="FLX_NO_DEBUG" unless="debug" />
-
 	<!--Enable this for Nape release builds for a serious peformance improvement-->
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
-
 	<!-- TODO: REMOVE THIS!!!! -->
 	<haxeflag name="-w" value="-WDeprecated" />
-
 	<!-- _________________________________ Custom _______________________________ -->
-
 	<!-- Disable trace() calls in release builds to bump up performance. -->
 	<haxeflag name="--no-traces" unless="debug" />
-
 	<!-- HScript relies heavily on Reflection, which means we can't use DCE. -->
 	<haxeflag name="-dce no" />
-	
 	<!-- Ensure all Funkin' classes are available at runtime. -->
 	<haxeflag name="--macro" value="include('funkin')" />
-	
 	<!-- Ensure all UI components are available at runtime. -->
 	<haxeflag name="--macro" value="include('haxe.ui.backend.flixel.components')" />
 	<haxeflag name="--macro" value="include('haxe.ui.containers.dialogs')" />
 	<haxeflag name="--macro" value="include('haxe.ui.containers.menus')" />
 	<haxeflag name="--macro" value="include('haxe.ui.containers.properties')" />
 	<haxeflag name="--macro" value="include('haxe.ui.core')" />
-  <haxeflag name="--macro" value="include('haxe.ui.components')" />
-  <haxeflag name="--macro" value="include('haxe.ui.containers')" />
-
+	<haxeflag name="--macro" value="include('haxe.ui.components')" />
+	<haxeflag name="--macro" value="include('haxe.ui.containers')" />
 	<!--
 		Ensure additional class packages are available at runtime (some only really used by scripts).
 		Ignore packages we can't include.
 	-->
 	<haxeflag name="--macro" value="include('flixel', true, [ 'flixel.addons.editors.spine.*', 'flixel.addons.nape.*', 'flixel.system.macros.*' ])" />
-
-
-
 	<!-- Necessary to provide stack traces for HScript. -->
 	<haxedef name="hscriptPos" />
 	<haxedef name="HXCPP_CHECK_POINTER" />
 	<haxedef name="HXCPP_STACK_LINE" />
-
-
 	<!-- This macro allows addition of new functionality to existing Flixel. -->
 	<haxeflag name="--macro" value="addMetadata('@:build(funkin.util.macro.FlxMacro.buildFlxBasic())', 'flixel.FlxBasic')" />
-
 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
-
-	<icon path="art/icon16.png" size='16' />
-	<icon path="art/icon32.png" size='32' />
-	<icon path="art/icon64.png" size='64' />
+	<icon path="art/icon16.png" size="16" />
+	<icon path="art/icon32.png" size="32" />
+	<icon path="art/icon64.png" size="64" />
 	<icon path="art/iconOG.png" />
-
 	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
-
 	<haxedef name="CAN_OPEN_LINKS" unless="switch" />
 	<haxedef name="CAN_CHEAT" if="switch debug" />
 	<haxedef name="haxeui_no_mouse_reset" />
-
 	<!-- Skip the Intro -->
 	<section if="debug">
 		<!-- Starts the game at the specified week, at the first song -->
 		<!-- <haxedef name="week" value="1" if="debug"/> -->
-
 		<!-- Starts the game at the specified song -->
 		<!-- <haxedef name="song" value="bopeebo" if="debug"/> -->
-
 		<!-- Difficulty, only used for week or song, defaults to 1 -->
 		<!-- <haxedef name="dif" value="2" if="debug"/> -->
 	</section>
-
 	<!-- <haxedef name="CLEAR_INPUT_SAVE"/> -->
-
 	<section if="newgrounds">
 		<!-- Enables Ng.core.verbose -->
 		<!-- <haxedef name="NG_VERBOSE" /> -->
-
 		<!-- Enables a NG debug session, so medals don't permently unlock -->
 		<!-- <haxedef name="NG_DEBUG" /> -->
-
 		<!-- pretends that the saved session Id was expired, forcing the reconnect prompt -->
 		<!-- <haxedef name="NG_FORCE_EXPIRED_SESSION" if="debug" /> -->
 	</section>
-
 	<!-- <prebuild haxe="trace('prebuilding');"/> -->
 	<!-- <postbuild haxe="art/Postbuild.hx"/> -->
-
 	<!-- <config:ios allow-provisioning-updates="true" team-id="" /> -->
-
 	<!-- Options for Polymod -->
 	<section if="polymod">
 		<!-- Turns on additional debug logging. -->
@@ -247,14 +192,12 @@
 		<!-- Determines the file in the mod folder used for the icon. -->
 		<haxedef name="POLYMOD_MOD_ICON_FILE" value="_polymod_icon.png" />
 	</section>
-
-	<section if='TOOLS'>
+	<section if="TOOLS">
 		<!-- Compiles tool for old song conversion shit -->
 		<!-- Assumes you use it on windows/desktop!!!! -->
-		<postbuild command='haxe -main art/SongConverter.hx --cs export/songShit' />
-		<assets path='export/songShit/bin/SongConverter.exe' rename='SongConverter.exe' />
-
+		<postbuild command="haxe -main art/SongConverter.hx --cs export/songShit" />
+		<assets path="export/songShit/bin/SongConverter.exe" rename="SongConverter.exe" />
 		<!-- <postbuild command='ren export/songShit/bin export/songShit/tools '/> -->
 		<!-- <postbuild command='move export/songShit/tools export/release/windows/bin'/> -->
 	</section>
-</project>
\ No newline at end of file
+</project>
diff --git a/source/module.xml b/source/module.xml
index dd7c9ad20..c3437d993 100644
--- a/source/module.xml
+++ b/source/module.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <module>
 	<!-- A module provides additional behavior and configuration for HaxeUI. -->
 	<components>
@@ -14,8 +14,7 @@
 		<class package="haxe.ui.containers.properties" loadAll="true" />
 		<class package="haxe.ui.containers" loadAll="true" />
 		<class package="haxe.ui.core" loadAll="true" />
-		
 		<!-- Custom components. -->
 		<class package="funkin.ui.haxeui.components" loadAll="true" />
 	</components>
-</module>
\ No newline at end of file
+</module>