diff --git a/Project.xml b/Project.xml
index 05a1db7e..a011c848 100644
--- a/Project.xml
+++ b/Project.xml
@@ -1,54 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
-    <!-- _________________________ Application Settings _________________________ -->
+    <!-- APP SETTINGS -->
+    <app title="Friday Night Funkin" file="Friday Night Funkin" packageName="com.nmvTeam.nightmareEngine" package="com.nmvTeam.nightmareEngine" main="Main" version="0.2.7" company="nmvTeam"/>
 
-    <app title="Friday Night Funkin" file="Friday Night Funkin" packageName="com.nmvTeam.nightmareEngine" package="com.nmvTeam.nightmareEngine" main="Main" version="0.2.7" company="nmvTeam" />
-
-    <!--Switch Export with Unique ApplicationID and Icon-->
-    <set name="APP_ID" value="0x0100f6c013bbc000" />
-
-    <!-- NOTE TO SELF: DISABLE THIS IF ISSUES ARE FOUND -->
-    <haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB"/>
-    <!-- stable luas PUT AFTER FIRST LINE WITH APP NAME AND ETC -->
-
-    <!--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="flixel.system.FlxPreloader" />
-
-    <!--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="60" background="#000000" hardware="true" vsync="false" />
-
-    <!--Desktop-specific-->
+    <window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false"/>
     <window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>
-	<window unless="mac" allow-high-dpi="true" />
+	<window unless="mac" allow-high-dpi="true"/>
 
-    <!--Mobile-specific-->
     <window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false"/>
 
-    <!--Switch-specific-->
-    <window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
-
-    <!-- _____________________________ Engine Config Settings ____________________________ -->
+    <!-- ENGINE CONFIGS -->
 
-    <!--ENGINE CUSTOMIZATION-->
-    <define name="MODS_ALLOWED" if="desktop" />
-    <define name="VIDEOS_ALLOWED" if="cpp" />
-    <define name="DISCORD_ALLOWED" if="cpp"/>
+    <define name="MODS_ALLOWED" if="desktop"/>
+    <define name="VIDEOS_ALLOWED" if="cpp"/>
+    <define name="DISCORD_ALLOWED" if="cpp" unless="android || ios"/>
 
-    <!-- _____________________________ Path Settings ____________________________ -->
+    <!-- PATH SETTINGS -->
 
-    <classpath name="source" />
+    <classpath name="source"/>
 
-    <!--Fixes hxvlc using global rather than local. you will need to use hmm/hxpkg to compile this project though-->
+    <!--Fixes hxvlc using global rather than local. you will need to use hmm / hxpkg to compile this project though-->
     <setenv name="HAXEPATH" value="./"/>
 
-    <set name="BUILD_DIR" value="export/debug" if="debug" />
+    <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="32bits" />
     <set name="BUILD_DIR" value="${BUILD_DIR}-tracy" if="FEATURE_DEBUG_TRACY"/>
@@ -64,22 +38,20 @@
         <assets path="projFiles/alsoft.ini" rename="alsoft.conf" type="text" unless="windows"/>
     </section>
 
-    <!-- _______________________________ Haxe libraries ______________________________ -->
-
+    <!-- HAXE LIBS -->
     <!--Core engine libraries-->
     <haxelib name="openfl"/>
-
     <haxelib name="flixel"/>
     <haxelib name="flixel-addons"/>
     <haxelib name="flixel-ui" version="2.6.4"/>
-
+    <haxelib name="flixel-animate"/>
+		
     <haxelib name="hscript-iris" version="git"/>
 
-    <haxelib name="flixel-animate"/>
     <haxelib name="moonchart"/>
 
-    <haxelib name="haxeui-core" />
-    <haxelib name="haxeui-flixel" />
+    <haxelib name="haxeui-core"/>
+    <haxelib name="haxeui-flixel"/>
 
     <haxelib name="funkin.vis"/>
     <haxelib name="grig.audio"/>
@@ -89,7 +61,7 @@
     <haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED" version="1.3.0"/>
     <haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
 
-    <!-- ______________________________ macros _____________________________ -->
+    <!-- MACROS -->
 
     <haxeflag name="--macro" value="addMetadata('@:build(funkin.backend.macro.FlxMacro.buildFlxSprite())', 'flixel.FlxSprite')" />
     <haxeflag name="--macro" value="addMetadata('@:build(funkin.backend.macro.FlxMacro.buildFlxBasic())', 'flixel.FlxBasic')" />
@@ -104,7 +76,7 @@
     
     <haxeflag name="-dce no" />
 
-    <!-- ______________________________ Haxedefines _____________________________ -->
+    <!-- HAXEDEFS -->
 
     <!--Needed for haxeui-->
     <haxedef name="haxeui_dont_impose_base_class"/>
@@ -113,67 +85,44 @@
     <!--Needed for better error reporting with hscript-->
     <define name="hscriptPos"/>
 
-    <!--Tracy profiler stuff-->
+    <!--Tracy profiler defines-->
     <section if="FEATURE_DEBUG_TRACY">
         <haxedef name="HXCPP_TELEMETRY"/>
         <haxedef name="HXCPP_TRACY"/>
         <haxedef name="HXCPP_TRACY_MEMORY"/>
         <haxedef name="HXCPP_TRACY_ON_DEMAND"/>
         <haxedef name="absolute-paths"/>
-        <!-- <haxedef name="HXCPP_TRACY_INCLUDE_CALLSTACKS"/> -->
     </section>
 
     <!--Enable for better crash handling/reporting-->
     <haxedef name="CRASH_HANDLER"/>
 
-    <haxedef name="openfl-enable-handle-error" if="CRASH_HANDLER"/>
-
-    <haxedef name="HXCPP_CHECK_POINTER" if="CRASH_HANDLER"/>
-    <haxedef name="HXCPP_STACK_LINE" if="CRASH_HANDLER"/>
-    <haxedef name="HXCPP_STACK_TRACE" if="CRASH_HANDLER"/>
-
-    <!--Disables all tracing abilities. Enable this for a small performance improvement-->
-    <!-- <define name="DISABLE_TRACES" if="desktop release"/> -->
-
+	<section if="CRASH_HANDLER">
+   		<haxedef name="openfl-enable-handle-error"/>
+    	<haxedef name="HXCPP_CHECK_POINTER"/>
+    	<haxedef name="HXCPP_STACK_LINE"/>
+    	<haxedef name="HXCPP_STACK_TRACE"/>
+	</section>
+ 
     <!--Remove the legacy health system-->
-    <haxedef name="FLX_NO_HEALTH" />
+    <haxedef name="FLX_NO_HEALTH"/>
 
     <!--Disable the Flixel core focus lost screen-->
-    <haxedef name="FLX_NO_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" />
+    <haxedef name="FLX_NO_DEBUG" unless="debug"/>
 
     <!--For haxe 4.3.0 and newer cleaner error reporting-->
-    <haxedef name="message.reporting" value="pretty" />
+    <haxedef name="message.reporting" value="pretty"/>
 
     <!--For haxe 4.3.0 and newer disables warnings-->
     <haxedef name="no-deprecation-warnings"/>
 
-    <!-- <haxedef name="FLX_NO_PITCH" /> -->
-
-    <!--Enable the Flixel core recording system-->
-    <!--<haxedef name="FLX_RECORD" />-->
-
-    <!--Disable the right and middle mouse buttons-->
-    <!-- <haxedef name="FLX_NO_MOUSE_ADVANCED" /> -->
-
-    <!--Disable the native cursor API on Flash-->
-    <!--<haxedef name="FLX_NO_NATIVE_CURSOR" />-->
-
-    <!--Disable the Flixel core sound tray-->
-    <!--<haxedef name="FLX_NO_SOUND_TRAY" />-->
-
-    <!--Disable the Flixel sound management code-->
-    <!--<haxedef name="FLX_NO_SOUND_SYSTEM" />-->
-
-    <!-- _________________________________ Custom _______________________________ -->
+	<!-- MISCELLANEOUS -->
 
     <icon path="projFiles/icon/icon16.png" size='16'/>
     <icon path="projFiles/icon/icon32.png" size='32'/>
     <icon path="projFiles/icon/icon64.png" size='64'/>
-    <icon path="projFiles/icon/iconOG.png" />
+    <icon path="projFiles/icon/iconOG.png"/>
 </project>