diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua
index 51ef18c621..d2d73ce2c7 100644
--- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua	
+++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/profile.lua	
@@ -35,24 +35,8 @@ local rankingX = capWideScale(75,90)
 local rankingY = capWideScale(200,180)
 local rankingTitleWidth = (rankingWidth/(#ms.SkillSets + 1))
 
-local skillsets = {
-	Overall = 0,
-	Speed 	= 0,
-	Stam  	= 0,
-	Jack  	= 0,
-	Technical = 0
-}
-
-
 if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
 	profile = GetPlayerOrMachineProfile(PLAYER_1)
-	if profile ~= nil then
-		skillsets.Overall = profile:GetPlayerRating()
-		skillsets.Speed = profile:GetPlayerSkillsetRating(2)
-		skillsets.Stam = profile:GetPlayerSkillsetRating(3)
-		skillsets.Jack = profile:GetPlayerSkillsetRating(4)
-		skillsets.Technical = profile:GetPlayerSkillsetRating(5)
-	end
 end
 
 
@@ -201,8 +185,9 @@ local function littlebits(i)
 			InitCommand=cmd(xy,frameX+(frameWidth/2)+90,frameY+20 + 22*i;halign,1;zoom,0.5),
 			BeginCommand=cmd(queuecommand,"Set"),
 			SetCommand=function(self)
-				self:settextf("%5.2f",skillsets[ms.SkillSets[i]])
-				self:diffuse(ByMSD(skillsets[ms.SkillSets[i]]))
+				local rating = profile:GetPlayerSkillsetRating(i)
+				self:settextf("%5.2f",rating)
+				self:diffuse(ByMSD(rating))
 			end,
 			PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
 			PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
diff --git a/Themes/Til Death/Scripts/WifeSundries.lua b/Themes/Til Death/Scripts/WifeSundries.lua
index 0ddd81699b..7efb011513 100644
--- a/Themes/Til Death/Scripts/WifeSundries.lua	
+++ b/Themes/Til Death/Scripts/WifeSundries.lua	
@@ -56,9 +56,12 @@ ms.JudgeCountInverse = {
 
 ms.SkillSets = {
 	"Overall", 
-	"Speed", 
-	"Stam", 
-	"Jack",
+	"Stream", 
+	"Jumpstream", 
+	"Handstream", 
+	"Stamina",
+	"Jack Speed",
+	"Jack Stamina",
 	"Technical"
 }
 
diff --git a/extern/MinaCalc/MinaCalc.lib b/extern/MinaCalc/MinaCalc.lib
index cb4bdd0311..f76dfc3ada 100644
Binary files a/extern/MinaCalc/MinaCalc.lib and b/extern/MinaCalc/MinaCalc.lib differ
diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp
index 68e88ee6cd..e78bd1d27d 100644
--- a/src/GameConstantsAndTypes.cpp
+++ b/src/GameConstantsAndTypes.cpp
@@ -274,19 +274,25 @@ XToLocalizedString( HoldNoteScore );
 // wtf is this shit - mina
 static const char *SkillsetNames[] = {
 	"Overall",
-	"Speed",
+	"Stream",
+	"Jumpstream",
+	"Handstream",
 	"Stamina",
-	"Jack",
+	"Jack Speed",
+	"Jack Stamina",
 	"Technical",
 };
 XToString(Skillset);
 LuaXType(Skillset);
 Skillset StringToSkillset(const RString &s) {
-	if (s == "Overall")			return Skill_Overall;
-	else if (s == "Speed")		return Skill_Speed;
-	else if (s == "Stamina")	return Skill_Stamina;
-	else if (s == "Jack")		return Skill_Jack;
-	else if (s == "Technical")	return Skill_Technical;
+	if (s == "Overall")				return Skill_Overall;
+	else if (s == "Stream")			return Skill_Stream;
+	else if (s == "Jumpstream")		return Skill_Jumpstream;
+	else if (s == "Handstream")		return Skill_Jumpstream;
+	else if (s == "Stamina")		return Skill_Stamina;
+	else if (s == "Jack Speed")		return Skill_JackSpeed;
+	else if (s == "Jack Stamina")	return Skill_JackStamina;
+	else if (s == "Technical")		return Skill_Technical;
 
 	return Skill_Overall;
 }
diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
index 115c888985..5363b7c08a 100644
--- a/src/GameConstantsAndTypes.h
+++ b/src/GameConstantsAndTypes.h
@@ -23,9 +23,12 @@ const int MAX_NUM_CREDITS = 20;
 
 enum Skillset {
 	Skill_Overall,
-	Skill_Speed,
+	Skill_Stream,
+	Skill_Jumpstream,
+	Skill_Handstream,
 	Skill_Stamina,
-	Skill_Jack,
+	Skill_JackSpeed,
+	Skill_JackStamina,
 	Skill_Technical,
 	NUM_Skillset,
 	Skillset_Invalid,