diff --git a/Data/AI.ini b/Data/AI.ini
index d3d3c517b0..24185ed635 100644
--- a/Data/AI.ini
+++ b/Data/AI.ini
@@ -40,16 +40,16 @@ WeightW1=50
 
 [Skill5]
 WeightMiss=
-WeightW5=0
-WeightW4=0
-WeightW3=0
-WeightW2=0
-WeightW1=100
+WeightW5=1
+WeightW4=1
+WeightW3=5
+WeightW2=30
+WeightW1=55
 
 [Skill6]
-WeightMiss=
+WeightMiss=0
 WeightW5=0
 WeightW4=0
-WeightW3=0
-WeightW2=0
-WeightW1=100
\ No newline at end of file
+WeightW3=5
+WeightW2=30
+WeightW1=70
\ No newline at end of file
diff --git a/Songs/Kommisar Originals/Mecha-Tribe Assault (StepsTiming)/Mecha-Tribe Assault.sm b/Songs/StepMania 5/MechaTribe Assault (StepsTiming)/Mecha-Tribe Assault.sm
similarity index 82%
rename from Songs/Kommisar Originals/Mecha-Tribe Assault (StepsTiming)/Mecha-Tribe Assault.sm
rename to Songs/StepMania 5/MechaTribe Assault (StepsTiming)/Mecha-Tribe Assault.sm
index 55c38d252a..313b5f7576 100644
--- a/Songs/Kommisar Originals/Mecha-Tribe Assault (StepsTiming)/Mecha-Tribe Assault.sm	
+++ b/Songs/StepMania 5/MechaTribe Assault (StepsTiming)/Mecha-Tribe Assault.sm	
@@ -5,11 +5,11 @@
 #SUBTITLETRANSLIT:;
 #ARTISTTRANSLIT:;
 #CREDIT:Graphics - Noon;
-#BANNER:../Mecha-Tribe Assault (Wyde)/mechatribeassaultbn.png;
-#BACKGROUND:../Mecha-Tribe Assault (Wyde)/mechatribeassaultbg.png;
+#BANNER:../MechaTribe Assault/mechatribeassaultbn.png;
+#BACKGROUND:../Mecha-Tribe Assault/mechatribeassaultbg.png;
 #LYRICSPATH:;
 #CDTITLE:wyde cd-tital.png;
-#MUSIC:../Mecha-Tribe Assault (Wyde)/Mecha-Tribe Assault.ogg;
+#MUSIC:../MechaTribe Assault/Mecha-Tribe Assault.ogg;
 #OFFSET:-0.028;
 #SAMPLESTART:48.018;
 #SAMPLELENGTH:16.040;
diff --git a/Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/Mecha-Tribe Assault.ogg b/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ogg
similarity index 100%
rename from Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/Mecha-Tribe Assault.ogg
rename to Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.ogg
diff --git a/Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/Mecha-Tribe Assault.sm b/Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.sm
similarity index 100%
rename from Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/Mecha-Tribe Assault.sm
rename to Songs/StepMania 5/MechaTribe Assault/Mecha-Tribe Assault.sm
diff --git a/Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/mechatribeassaultbg.png b/Songs/StepMania 5/MechaTribe Assault/mechatribeassaultbg.png
similarity index 100%
rename from Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/mechatribeassaultbg.png
rename to Songs/StepMania 5/MechaTribe Assault/mechatribeassaultbg.png
diff --git a/Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/mechatribeassaultbn.png b/Songs/StepMania 5/MechaTribe Assault/mechatribeassaultbn.png
similarity index 100%
rename from Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/mechatribeassaultbn.png
rename to Songs/StepMania 5/MechaTribe Assault/mechatribeassaultbn.png
diff --git a/Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/wyde cd-tital.png b/Songs/StepMania 5/MechaTribe Assault/wyde cd-tital.png
similarity index 100%
rename from Songs/Kommisar Originals/Mecha-Tribe Assault (Wyde)/wyde cd-tital.png
rename to Songs/StepMania 5/MechaTribe Assault/wyde cd-tital.png
diff --git a/Songs/Kommisar Originals/Springtime (StepsTiming)/Springtime.sm b/Songs/StepMania 5/Springtime (StepsTiming)/Springtime.sm
similarity index 83%
rename from Songs/Kommisar Originals/Springtime (StepsTiming)/Springtime.sm
rename to Songs/StepMania 5/Springtime (StepsTiming)/Springtime.sm
index 2eb73e90ca..e393e8890c 100644
--- a/Songs/Kommisar Originals/Springtime (StepsTiming)/Springtime.sm	
+++ b/Songs/StepMania 5/Springtime (StepsTiming)/Springtime.sm	
@@ -5,11 +5,11 @@
 #SUBTITLETRANSLIT:;
 #ARTISTTRANSLIT:;
 #CREDIT:;
-#BANNER:../Springtime (Kory + Kommisar)/springbn.png;
-#BACKGROUND:../Springtime (Kory + Kommisar)/spring.png;
+#BANNER:../Springtime/springbn.png;
+#BACKGROUND:../Springtime/spring.png;
 #LYRICSPATH:;
 #CDTITLE:;
-#MUSIC:../Springtime (Kory + Kommisar)/Springtime.ogg;
+#MUSIC:../Springtime/Springtime.ogg;
 #OFFSET:-0.658;
 #SAMPLESTART:42.940;
 #SAMPLELENGTH:9.360;
diff --git a/Songs/Kommisar Originals/Springtime (Kory + Kommisar)/Kommisar - Springtime.mp3 b/Songs/StepMania 5/Springtime/Kommisar - Springtime.mp3
similarity index 100%
rename from Songs/Kommisar Originals/Springtime (Kory + Kommisar)/Kommisar - Springtime.mp3
rename to Songs/StepMania 5/Springtime/Kommisar - Springtime.mp3
diff --git a/Songs/Kommisar Originals/Springtime (Kory + Kommisar)/Springtime.sm b/Songs/StepMania 5/Springtime/Springtime.sm
similarity index 100%
rename from Songs/Kommisar Originals/Springtime (Kory + Kommisar)/Springtime.sm
rename to Songs/StepMania 5/Springtime/Springtime.sm
diff --git a/Songs/Kommisar Originals/Springtime (Kory + Kommisar)/spring.png b/Songs/StepMania 5/Springtime/spring.png
similarity index 100%
rename from Songs/Kommisar Originals/Springtime (Kory + Kommisar)/spring.png
rename to Songs/StepMania 5/Springtime/spring.png
diff --git a/Songs/Kommisar Originals/Springtime (Kory + Kommisar)/springbn.png b/Songs/StepMania 5/Springtime/springbn.png
similarity index 100%
rename from Songs/Kommisar Originals/Springtime (Kory + Kommisar)/springbn.png
rename to Songs/StepMania 5/Springtime/springbn.png