From 60a27399867641c4126c7991bf3c53a7a7b5973c Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Mon, 27 Feb 2012 03:15:15 -0600
Subject: [PATCH 01/14] updated japanese language

---
 Docs/license-ext/theme_lang-ja.txt | 14 +++++---------
 Themes/_fallback/Languages/ja.ini  | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Docs/license-ext/theme_lang-ja.txt b/Docs/license-ext/theme_lang-ja.txt
index 49b0a6e592..40a53606aa 100644
--- a/Docs/license-ext/theme_lang-ja.txt
+++ b/Docs/license-ext/theme_lang-ja.txt
@@ -1,23 +1,19 @@
-Stepmania 5系本体用　日本語化セット6(2012/02/19)
+Stepmania 5系本体用　日本語化セット7(2012/02/26)
 作者：ナイラー
 -----------
 Stepmania5系本体では従来の日本語テーマ、および日本語ランゲージファイルが使用できなくなっています。
 個人的に日本語が見えているほうが安心できるので、とりあえずファイルを製作してみました。
 -----------
 以下のファイルが同梱されています。
-・fallbackja.ini(_fallbackテーマ用日本語ランゲージファイル) Ver 1.05γ
+・fallbackja.ini(_fallbackテーマ用日本語ランゲージファイル) Ver 1.06-A
 ・themeja.ini(デフォルトテーマ用日本語ランゲージファイル) Ver 1.03γ
-(添字がβからγになったのに強い意味はありません。番号動かしたくなかったので)
 -----------
 今回の更新点
-おそらくalpha 1に対するファイルとしては最終更新となります。
+今回からalpha 1a正式対応ということで。ああ石投げないで「てめー文章打ってるだけだろ」とか言わないで。
 fallbackja.iniに対して
-・エディットの曲選択時の解説を微変更。
-・詳細オプションの名前を一部変更。
-・一部プレイオプションが紛れ込んでいたのを削除。
+・エディットにとある設定項目が追加されたのでその部分の翻訳。
 themeja.iniに対して
-・プレイオプションの解説を少し充実した。
-・テーマ固有オプションの名前、および解説の微変更。
+・今回は更新されていません。セット6と同内容が収録されています。
 -----------
 それぞれのファイルは、次の場所に配置してください。
 ・fallbackja.iniは、「Theme」フォルダの「_fallback」フォルダ内の「Language」フォルダに、
diff --git a/Themes/_fallback/Languages/ja.ini b/Themes/_fallback/Languages/ja.ini
index f76eec43f1..e81c5ef6c6 100644
--- a/Themes/_fallback/Languages/ja.ini
+++ b/Themes/_fallback/Languages/ja.ini
@@ -1,4 +1,4 @@
-�ｻｿ;Stepmania 5.0邉ｻ譛ｬ菴鍋畑縲�_fallback繝�繝ｼ繝樊律譛ｬ隱槫喧繝輔ぃ繧､繝ｫVer 1.05ﾎｳ
+�ｻｿ;Stepmania 5.0邉ｻ譛ｬ菴鍋畑縲�_fallback繝�繝ｼ繝樊律譛ｬ隱槫喧繝輔ぃ繧､繝ｫVer 1.06-A
 
 [Common]
 WindowTitle=StepMania
@@ -965,6 +965,7 @@ Min BPM=譛�蟆�(陦ｨ遉ｺ)BPM
 Mines=蝨ｰ髮ｷ
 Mirror Player 1 to 2=1P縺ｮ繝弱�ｼ繝医ｒ2P縺ｫ繝溘Λ繝ｼ
 Mirror Player 2 to 1=2P縺ｮ繝弱�ｼ繝医ｒ1P縺ｫ繝溘Λ繝ｼ
+Modify Keysounds at current beat=繧ｪ繝悶ず繧ｧ縺ｫ繧ｭ繝ｼ髻ｳ繧偵い繧ｵ繧､繝ｳ縺吶ｋ
 MoveRandomToEnd=譛�蠕後∪縺ｧ繝ｩ繝ｳ繝�繝�
 More Options=隧ｳ邏ｰ繧ｪ繝励す繝ｧ繝ｳ
 MovieColorDepth=繝�繝ｼ繝薙�ｼ縺ｮ\n譛牙柑濶ｲ謨ｰ
@@ -1112,6 +1113,8 @@ Shuffle=繧ｷ繝｣繝�繝輔Ν
 GamePrefDefaultFail=譖ｲ縺ｮ邨ゆｺ�
 #
 UserPrefScoringMode=繧ｹ繧ｳ繧｢縺ｮ險育ｮ玲婿蠑�
+
+
 [PaneDisplay]
 Steps=繧ｪ繝悶ず繧ｧ
 Holds=繝帙�ｼ繝ｫ繝�
@@ -1363,6 +1366,12 @@ Help=繝倥Ν繝�
 Info=諠�蝣ｱ
 Routine Player=繝ｫ繝ｼ繝√Φ繝励Ξ繧､繝､繝ｼ
 
+Track %d=(蟾ｦ縺九ｉ) %d繝ｬ繝ｼ繝ｳ逶ｮ縺ｮ繧｢繧ｵ繧､繝ｳ
+None=辟｡縺�
+New Sound=譁ｰ隕上↓繧｢繧ｵ繧､繝ｳ
+Enter New Keysound File=繧ｭ繝ｼ髻ｳ繝輔ぃ繧､繝ｫ縺ｮ蜷榊燕繧貞�･蜉帙＠縺ｦ縺上□縺輔＞縲�\n迚ｹ縺ｫ髟ｷ縺�繝輔ぃ繧､繝ｫ繝阪�ｼ繝�繧帝俣驕輔ｏ縺ｪ縺�繧医≧縺ｫ縺励※縺上□縺輔＞縲�
+
+
 [ScreenEditMenu]
 HeaderText=隴憺擇縺ｮ邱ｨ髮�
 HeaderSubText=譖ｲ縺ｫ隴憺擇繧貞牡繧雁ｽ薙※縲∫ｷｨ髮�縺ｧ縺阪∪縺吶��
@@ -1719,11 +1728,11 @@ Setup=繧ｯ繧､繝�繧ｯ繧ｻ繝�繝医い繝�繝�
 Error adding file '%s'.=縲�%s縲阪�ｮ霑ｽ蜉�縺ｧ繧ｨ繝ｩ繝ｼ縺檎匱逕溘＠縺ｾ縺励◆縲�
 
 [SongManager]
-Loading courses...=繧ｳ繝ｼ繧ｹ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ窶ｦ
-Loading songs...=譖ｲ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ窶ｦ
-Reloading...=繝ｪ繝ｭ繝ｼ繝我ｸｭ窶ｦ
-Unloading songs...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ窶ｦ
-Unloading courses...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ窶ｦ窶ｦ
+Loading courses...=繧ｳ繝ｼ繧ｹ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ
+Loading songs...=譖ｲ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ
+Reloading...=繝ｪ繝ｭ繝ｼ繝我ｸｭ
+Unloading songs...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ
+Unloading courses...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ
 The folder "%s" appears to be a song folder.  All song folders must reside in a group folder.  For example, "Songs/Originals/My Song".=縲�%s縲阪�ｯ譖ｲ繝輔か繝ｫ繝�縺ｧ縺吶�よ峇繝輔か繝ｫ繝�縺ｯ繧ｰ繝ｫ繝ｼ繝励ヵ繧ｩ繝ｫ繝�縺ｮ荳ｭ縺ｫ驟咲ｽｮ縺励※縺上□縺輔＞縲�
 
 [SongUtil]

From 244e06ae034def248bffed20cc54ac77c0e560f7 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Thu, 23 Feb 2012 23:28:53 -0500
Subject: [PATCH 02/14] [sm5a2futures] Fix linker warnings at end.

This is probably not the best way to do it.

Anyone have a better plan?
---
 src/StepMania-net2010.vcxproj | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/StepMania-net2010.vcxproj b/src/StepMania-net2010.vcxproj
index a224807f7e..af09986555 100644
--- a/src/StepMania-net2010.vcxproj
+++ b/src/StepMania-net2010.vcxproj
@@ -67,19 +67,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)../Program/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(ConfigurationName)</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)../Program/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(ConfigurationName)</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">$(TargetDir)../Program/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(ConfigurationName)</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">true</GenerateManifest>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">$(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(ConfigurationName)</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -97,8 +97,8 @@
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Lib;$(LibraryPath)</LibraryPath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath)</IncludePath>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StepMania</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">StepMania</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StepMania-debug</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">StepMania-fastdebug</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">StepMania</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">StepMania</TargetName>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files (x86)\Microsoft DirectX 9.0 SDK (Summer 2004)\Include;$(IncludePath)</IncludePath>
@@ -2387,4 +2387,4 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

From 241eabcb359252c33e3153158703ed0fc996103d Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Tue, 28 Feb 2012 23:34:56 -0600
Subject: [PATCH 03/14] Update credits (sy567 -> hanubeki) per the description
 of hanubeki-modified-sm-ssc

---
 Docs/credits.txt                                        | 2 +-
 Themes/_fallback/BGAnimations/ScreenCredits overlay.lua | 2 +-
 Themes/default/BGAnimations/ScreenCredits overlay.lua   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Docs/credits.txt b/Docs/credits.txt
index d25b949511..d70374bac2 100644
--- a/Docs/credits.txt
+++ b/Docs/credits.txt
@@ -84,7 +84,7 @@ v1toko
 Macgravel
  * Orbular noteskin (the default kb7 noteskin)
 
-sy567
+hanubeki (@803832, formerly sy567)
  * Small beginner helper fix
  (http://www.stepmania.com/forums/showpost.php?p=158721&postcount=12)
 
diff --git a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua
index ec623597bc..c8dfe98f84 100644
--- a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
+++ b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
@@ -59,7 +59,7 @@ local contrib = {
 	"Petriform", -- default theme music
 	"譯懃ぜ蟆城ｳｩ/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
 	"Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes
-	"sy567", -- beginner helper fix
+	"hanubeki (@803832)", -- beginner helper fix, among various other things
 	"v1toko", -- x-mode from StepNXA
 }
 
diff --git a/Themes/default/BGAnimations/ScreenCredits overlay.lua b/Themes/default/BGAnimations/ScreenCredits overlay.lua
index c91c5781c7..36bd1b63bf 100644
--- a/Themes/default/BGAnimations/ScreenCredits overlay.lua	
+++ b/Themes/default/BGAnimations/ScreenCredits overlay.lua	
@@ -59,7 +59,7 @@ local contrib = {
 	"Petriform", -- default theme music
 	"譯懃ぜ蟆城ｳｩ/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
 	"Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes
-	"sy567", -- beginner helper fix
+	"hanubeki (@803832)", -- beginner helper fix, among various other things
 	"v1toko", -- x-mode from StepNXA
 }
 

From 050fb5b47367b8628944a6805c54787b57f5d4fa Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 15:48:46 -0600
Subject: [PATCH 04/14] [MemoryCardManager] Disable Memory Cards by default.

---
 Docs/Changelog_sm5.txt    | 9 +++++++++
 src/MemoryCardManager.cpp | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 0c9bc25055..c0b8916296 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -5,6 +5,15 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
+
+StepMania 5.0 alpha 2 | 20120???
+--------------------------------------------------------------------------------
+
+2012/03/01
+----------
+* [MemoryCardManager] Disable Memory Cards by default. If you want to use them,
+set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ]
+
 StepMania 5.0 alpha 1a | 20120219
 --------------------------------------------------------------------------------
 
diff --git a/src/MemoryCardManager.cpp b/src/MemoryCardManager.cpp
index b3ddb9e87e..6c30e7be0b 100644
--- a/src/MemoryCardManager.cpp
+++ b/src/MemoryCardManager.cpp
@@ -39,7 +39,7 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut
 	defaultValueOut = -1;
 }
 
-static Preference<bool>	g_bMemoryCards( "MemoryCards", true );
+static Preference<bool>	g_bMemoryCards( "MemoryCards", false );
 static Preference<bool>	g_bMemoryCardProfiles( "MemoryCardProfiles", true );
 
 // if set, always use the device that mounts to this point

From d9ad74e3abdf93494ab145f4692a469b869a5119 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 15:53:51 -0600
Subject: [PATCH 05/14] dance points for oni = true by default now

---
 src/PrefsManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index e113fa1ab9..f2dd86bc80 100644
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -213,7 +213,7 @@ PrefsManager::PrefsManager() :
 	m_iSongsPerPlay			( "SongsPerPlay",		3, ValidateSongsPerPlay ),
 	m_bDelayedCreditsReconcile	( "DelayedCreditsReconcile",	false ),
 	m_ShowSongOptions		( "ShowSongOptions",		Maybe_YES ),
-	m_bDancePointsForOni		( "DancePointsForOni",		false ),
+	m_bDancePointsForOni		( "DancePointsForOni",		true ),
 	m_bPercentageScoring		( "PercentageScoring",		false ),
 	m_fMinPercentageForMachineSongHighScore		( "MinPercentageForMachineSongHighScore",	0.0001f ), // This is for home, who cares how bad you do?
 	m_fMinPercentageForMachineCourseHighScore	( "MinPercentageForMachineCourseHighScore",	0.0001f ),	// don't save course scores with 0 percentage

From a19cce62bc09e87c88c29628afe2116a44b2619d Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Thu, 1 Mar 2012 13:55:07 -0800
Subject: [PATCH 06/14] Old style service menu. Sorry :^)!

---
 Themes/_fallback/metrics.ini | 79 +++++++++++++++++++++---------------
 Themes/test/metrics.ini      | 11 +++++
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 649d27c7c2..fc1dcd86b3 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2628,27 +2628,42 @@ Fallback="ScreenOptionsSimpleService"
 NextScreen=Branch.AfterInit()
 PrevScreen=Branch.AfterInit()
 
-LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
-# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
-LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
-LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
+LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,GraphicSound,Profiles,Network,UI,Advanced,Credits"
+LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
 LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
-Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
-Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
+LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input"
+LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options"
 LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
-LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
+LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
 LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
+LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
+
+# Old
+#LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
+# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
 
 # for ScreenOptionsExtended:
-Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
-LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
-Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
-Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
-Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
-Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
-Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
-Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
-LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+#LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction"
+#Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
+#Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
+#Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
+#Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
+#Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
+#Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
+#Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options"
+#Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options"
+#Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
+#LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
+#LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
+#LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
 
 [ScreenOptionsExtended]
 Fallback="ScreenOptionsService"
@@ -2794,8 +2809,8 @@ ShowExitRow=true
 [ScreenTestInput]
 Class="ScreenTestInput"
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 
 [ScreenOptionsSystemDirection]
 Fallback="ScreenOptionsServiceChild"
@@ -2828,8 +2843,8 @@ Line22="conf,EventMode"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
@@ -2854,8 +2869,8 @@ Line20="conf,VisualDelaySeconds"
 
 [ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
 LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
@@ -2881,8 +2896,8 @@ Line30="conf,FastLoad"
 
 [ScreenAppearanceOptions]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5,14,15,17,18,19"
 Line1="conf,Language"
 Line2="conf,Announcer"
@@ -2899,8 +2914,8 @@ Line19="conf,NumBackgrounds"
 # user interface options that aren't related to themes, etc.
 # (some don't get used/modified too often)
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,3,4,6,7,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
@@ -2920,8 +2935,8 @@ Line14="conf,ShowSongOptions"
 
 [ScreenOptionsInput]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="1,2,3,4,5"
 Line1="conf,AutoMapOnJoyChange"
 Line2="conf,OnlyDedicatedMenuButtons"
@@ -2931,8 +2946,8 @@ Line5="conf,MusicWheelSwitchSpeed"
 
 [ScreenOptionsArcade]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 # stuff tied to arcade features
 LineNames="1,2,3,4,5,6"
 Line1="conf,GetRankingName"
@@ -4043,8 +4058,8 @@ OptionRowNormalMetricsGroup="OptionRowCourseOverview"
 [ScreenGameplaySyncMachine]
 Class="ScreenGameplaySyncMachine"
 Fallback="ScreenGameplay"
-PrevScreen="ScreenOptionsExtended"
-NextScreen="ScreenOptionsExtended"
+PrevScreen="ScreenOptionsService"
+NextScreen="ScreenOptionsService"
 PlayerType="PlayerSyncMachine"
 
 #AllowCenter1Player=false
diff --git a/Themes/test/metrics.ini b/Themes/test/metrics.ini
index f8ca408206..c114dabdfa 100644
--- a/Themes/test/metrics.ini
+++ b/Themes/test/metrics.ini
@@ -1,6 +1,17 @@
 [Global]
 FallbackTheme=default
 [ScreenTitleMenu]
+# new scroll for wrapping
+ScrollerTransform=function(self,offset,itemIndex,numItems) \
+	self:y((28)*(itemIndex-(numItems-1)/2)); \
+	self:x(math.floor(itemIndex/5) * 128); \
+end;
+# more choices for debug stuff
+DefaultChoice="GameStart"
+# new stuff
+ChoiceNames="GameStart,Options,Edit,Jukebox,TestClearChildren,Exit"
+# new tests
+ChoiceTestClearChildren="screen,ScreenTestClearChildren;text,Test: Clear Children"
 [ScreenGameplay]
 # LifeP1OnCommand=visible,false
 # LifeP2OnCommand=visible,false

From 32ad05fa25056ba8d44b8f3bc855e68ded2d73c7 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Thu, 1 Mar 2012 13:57:26 -0800
Subject: [PATCH 07/14] oversight.

---
 Themes/default/metrics.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 07eb50c58c..08d00c0262 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -1290,8 +1290,8 @@ LineRollCombo="lua,ThemePrefRow('ComboOnRolls')"
 
 [ScreenOptionsTheme]
 Fallback="ScreenOptionsServiceChild"
-NextScreen="ScreenOptionsExtended"
-PrevScreen="ScreenOptionsExtended"
+NextScreen="ScreenOptionsService"
+PrevScreen="ScreenOptionsService"
 LineNames="gNotePos,gAuto,gScore,gSDisp,TimingDisplay,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter,FancyUIBG"
 LinegNotePos="lua,ThemePrefRow('NotePosition')"
 LinegScore="lua,ThemePrefRow('GameplayShowScore')"

From 666806a841a97db090e839006fc3ac5e81bd3c86 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Thu, 1 Mar 2012 14:20:49 -0800
Subject: [PATCH 08/14] easier to play course, no options in oni mode

---
 Courses/Default/Jupiter.crs  | 5 +++--
 Themes/_fallback/metrics.ini | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Courses/Default/Jupiter.crs b/Courses/Default/Jupiter.crs
index 529005cdb3..c33647c7f9 100644
--- a/Courses/Default/Jupiter.crs
+++ b/Courses/Default/Jupiter.crs
@@ -1,8 +1,9 @@
 #COURSE:Jupiter;
 #SCRIPTER:Midiman;
+#METER:Medium:5;
 
 #GAINSECONDS:120;
-#SONG:StepMania 5\Springtime:Hard;
+#SONG:StepMania 5\Springtime:Medium;nodifficult;
 
 #GAINSECONDS:25;
-#SONG:StepMania 5\MechaTribe Assault:Hard;
\ No newline at end of file
+#SONG:StepMania 5\MechaTribe Assault:Easy;nodifficult;
\ No newline at end of file
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index fc1dcd86b3..af68f1e940 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2009,7 +2009,7 @@ OptionsListTimeout=0.25
 #
 UsePlayerSelectMenu=false
 SelectMenuScreenName="ScreenPlayerOptions"
-OptionsMenuAvailable=true
+OptionsMenuAvailable=GAMESTATE:GetPlayMode() ~= "PlayMode_Oni"
 SelectMenuAvailable=false
 ModeMenuAvailable=true
 #

From 73bdb7fd54e40dc549c0bfd768543207a9ba3456 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 17:20:10 -0600
Subject: [PATCH 09/14] [GameState] Set Premium to Premium_DoubleFor1Credit by
 default.

---
 Docs/Changelog_sm5.txt | 1 +
 src/GameState.cpp      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index c0b8916296..9f423eacd6 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -13,6 +13,7 @@ StepMania 5.0 alpha 2 | 20120???
 ----------
 * [MemoryCardManager] Disable Memory Cards by default. If you want to use them,
 set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ]
+* [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ]
 
 StepMania 5.0 alpha 1a | 20120219
 --------------------------------------------------------------------------------
diff --git a/src/GameState.cpp b/src/GameState.cpp
index e985c0cb56..566ae1f0b8 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -103,7 +103,7 @@ static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2	("GameState","GradeTierFo
 static ThemeMetric<bool> ARE_STAGE_PLAYER_MODS_FORCED	("GameState","AreStagePlayerModsForced");
 static ThemeMetric<bool> ARE_STAGE_SONG_MODS_FORCED	("GameState","AreStageSongModsForced");
 
-static Preference<Premium> g_Premium( "Premium", Premium_Off );
+static Preference<Premium> g_Premium( "Premium", Premium_DoubleFor1Credit );
 Preference<bool> GameState::m_bAutoJoin( "AutoJoin", false );
 
 GameState::GameState() :

From 4f551cc25d6b95c03d45cff388bd4e98663f64f0 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 17:20:24 -0600
Subject: [PATCH 10/14] small changes to debug overlay; should not require any
 theme changes

---
 src/ScreenDebugOverlay.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp
index 1ca2b3c179..e992da578a 100644
--- a/src/ScreenDebugOverlay.cpp
+++ b/src/ScreenDebugOverlay.cpp
@@ -262,13 +262,10 @@ void ScreenDebugOverlay::Init()
 		BitmapText *p = new BitmapText;
 		p->SetName( "PageText" );
 		p->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "page") );
-		LOAD_ALL_COMMANDS( p );
-		// xxx: I shouldn't have to do this:
-		ON_COMMAND( p );
+		LOAD_ALL_COMMANDS_AND_ON_COMMAND( p );
 		// todo: Y value is still hardcoded. -aj
 		p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 );
 		p->SetText( *s + " (" + sButton + ")" );
-		//p->SetShadowLength( 1 );
 		m_vptextPages.push_back( p );
 		this->AddChild( p );
 	}
@@ -281,10 +278,7 @@ void ScreenDebugOverlay::Init()
 			bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") );
 			bt->SetHorizAlign( align_right );
 			bt->SetText( "blah" );
-			//p->SetShadowLength( 2 );
-			LOAD_ALL_COMMANDS( *bt );
-			// xxx: I shouldn't have to do this:
-			ON_COMMAND( bt );
+			LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt );
 			m_vptextButton.push_back( bt );
 			this->AddChild( bt );
 		}
@@ -294,10 +288,7 @@ void ScreenDebugOverlay::Init()
 			bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") );
 			bt->SetHorizAlign( align_left );
 			bt->SetText( "blah" );
-			//p->SetShadowLength( 2 );
-			LOAD_ALL_COMMANDS( *bt );
-			// xxx: I shouldn't have to do this:
-			ON_COMMAND( bt );
+			LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt );
 			m_vptextFunction.push_back( bt );
 			this->AddChild( bt );
 		}
@@ -366,7 +357,6 @@ void ScreenDebugOverlay::UpdateText()
 
 		int i = p-g_pvpSubscribers->begin();
 
-		//float fY = SCREEN_TOP+50 + iOffset * 16;
 		float fY = LINE_START_Y + iOffset * LINE_SPACING;
 
 		BitmapText &txt1 = *m_vptextButton[i];

From 8a827b3e9c25cfe3e9e2f83e5c66469a7b921876 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 17:38:44 -0600
Subject: [PATCH 11/14] changed BackgroundEffects sourced from
 http://www47.atwiki.jp/waiei/pages/19.html

---
 BackgroundEffects/SongBgWithMovieViz.lua     | 2 +-
 BackgroundEffects/StretchNoLoop.lua          | 2 +-
 BackgroundEffects/StretchNormalAlignLeft.lua | 2 +-
 BackgroundEffects/StretchNormalBlue.lua      | 2 +-
 BackgroundEffects/StretchNormalGreen.lua     | 2 +-
 BackgroundEffects/StretchNormalRed.lua       | 2 +-
 BackgroundEffects/StretchPaused.lua          | 2 +-
 BackgroundEffects/StretchRewind.lua          | 2 +-
 BackgroundEffects/Vizualization2File.lua     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BackgroundEffects/SongBgWithMovieViz.lua b/BackgroundEffects/SongBgWithMovieViz.lua
index d69c30b20c..5d145e652f 100644
--- a/BackgroundEffects/SongBgWithMovieViz.lua
+++ b/BackgroundEffects/SongBgWithMovieViz.lua
@@ -7,7 +7,7 @@ local t = Def.ActorFrame {
 	};
 
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music");
+		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchNoLoop.lua b/BackgroundEffects/StretchNoLoop.lua
index b73cc97797..c48fe01b0a 100644
--- a/BackgroundEffects/StretchNoLoop.lua
+++ b/BackgroundEffects/StretchNoLoop.lua
@@ -2,7 +2,7 @@ local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;loop,false;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;loop,false;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchNormalAlignLeft.lua b/BackgroundEffects/StretchNormalAlignLeft.lua
index ac6ba6f1ce..b145ef69d2 100644
--- a/BackgroundEffects/StretchNormalAlignLeft.lua
+++ b/BackgroundEffects/StretchNormalAlignLeft.lua
@@ -3,7 +3,7 @@ local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchNormalBlue.lua b/BackgroundEffects/StretchNormalBlue.lua
index e76dddb1e0..b5b7c629fb 100644
--- a/BackgroundEffects/StretchNormalBlue.lua
+++ b/BackgroundEffects/StretchNormalBlue.lua
@@ -3,7 +3,7 @@ local Color1 = color("0,0,1,1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchNormalGreen.lua b/BackgroundEffects/StretchNormalGreen.lua
index 4a00110253..f90436b90f 100644
--- a/BackgroundEffects/StretchNormalGreen.lua
+++ b/BackgroundEffects/StretchNormalGreen.lua
@@ -3,7 +3,7 @@ local Color1 = color("0,1,0,1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchNormalRed.lua b/BackgroundEffects/StretchNormalRed.lua
index 8a32d67168..caa8ccbfa9 100644
--- a/BackgroundEffects/StretchNormalRed.lua
+++ b/BackgroundEffects/StretchNormalRed.lua
@@ -3,7 +3,7 @@ local Color1 = color("1,0,0,1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchPaused.lua b/BackgroundEffects/StretchPaused.lua
index d1049964b4..41c81bdd52 100644
--- a/BackgroundEffects/StretchPaused.lua
+++ b/BackgroundEffects/StretchPaused.lua
@@ -2,7 +2,7 @@ local Color1 = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;pause;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;pause;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/StretchRewind.lua b/BackgroundEffects/StretchRewind.lua
index 9f1da9946e..05778de7ce 100644
--- a/BackgroundEffects/StretchRewind.lua
+++ b/BackgroundEffects/StretchRewind.lua
@@ -2,7 +2,7 @@ local Color = color(Var "Color1");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;position,0;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;position,0;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};
diff --git a/BackgroundEffects/Vizualization2File.lua b/BackgroundEffects/Vizualization2File.lua
index bd689b0c08..c729ed7b9d 100644
--- a/BackgroundEffects/Vizualization2File.lua
+++ b/BackgroundEffects/Vizualization2File.lua
@@ -3,7 +3,7 @@ local Color2 = color(Var "Color2");
 
 local t = Def.ActorFrame {
 	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
+		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
 		GainFocusCommand=cmd(play);
 		LoseFocusCommand=cmd(pause);
 	};

From ce4366e6050293df19611643ba3d9e9f66bb8f87 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 21:28:15 -0600
Subject: [PATCH 12/14] [ScreenSelectMusic] Added
 PlaySoundOnEnteringOptionsMenu metric (true/false).

---
 Docs/Changelog_sm5.txt       | 1 +
 Themes/_fallback/metrics.ini | 1 +
 src/ScreenSelectMusic.cpp    | 4 +++-
 src/ScreenSelectMusic.h      | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 9f423eacd6..8cfd8c6401 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -14,6 +14,7 @@ StepMania 5.0 alpha 2 | 20120???
 * [MemoryCardManager] Disable Memory Cards by default. If you want to use them,
 set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ]
 * [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ]
+* [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ]
 
 StepMania 5.0 alpha 1a | 20120219
 --------------------------------------------------------------------------------
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index af68f1e940..e95e4f8d90 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2014,6 +2014,7 @@ SelectMenuAvailable=false
 ModeMenuAvailable=true
 #
 ShowOptionsMessageSeconds=1.5
+PlaySoundOnEnteringOptionsMenu=true
 #
 ScreenModsCommand=setupmusicstagemods
 #
diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
index 76e22808d7..ca13e7acfc 100644
--- a/src/ScreenSelectMusic.cpp
+++ b/src/ScreenSelectMusic.cpp
@@ -94,6 +94,7 @@ void ScreenSelectMusic::Init()
 	TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" );
 	WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" );
 	NULL_SCORE_STRING.Load( m_sName, "NullScoreString" );
+	PLAY_SOUND_ON_ENTERING_OPTIONS_MENU.Load( m_sName, "PlaySoundOnEnteringOptionsMenu" );
 	// To allow changing steps with gamebuttons -DaisuMaster
 	CHANGE_STEPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeStepsWithGameButtons" );
 	CHANGE_GROUPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeGroupsWithGameButtons" );
@@ -437,7 +438,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		}
 
 		m_bGoToOptions = true;
-		m_soundStart.Play();
+		if( PLAY_SOUND_ON_ENTERING_OPTIONS_MENU )
+			m_soundStart.Play();
 		this->PlayCommand( "ShowEnteringOptions" );
 
 		// Re-queue SM_BeginFadingOut, since ShowEnteringOptions may have
diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h
index 3f64ecc505..aa2e9465d6 100644
--- a/src/ScreenSelectMusic.h
+++ b/src/ScreenSelectMusic.h
@@ -97,6 +97,7 @@ protected:
 	ThemeMetric<bool>		CHANGE_STEPS_WITH_GAME_BUTTONS;
 	ThemeMetric<bool>		CHANGE_GROUPS_WITH_GAME_BUTTONS;
 	ThemeMetric<RString>	NULL_SCORE_STRING;
+	ThemeMetric<bool>		PLAY_SOUND_ON_ENTERING_OPTIONS_MENU;
 
 	bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; }
 	bool CanChangeSteps() const { return TWO_PART_SELECTION ? m_SelectionState == SelectionState_SelectingSteps : m_SelectionState == SelectionState_SelectingSong; }

From 02ae959aab59aadd56e7b159e13f7e46ac650d33 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 21:35:33 -0600
Subject: [PATCH 13/14] [MusicWheel, WheelBase] Added collapse sound.

---
 Docs/Changelog_sm5.txt                            | 1 +
 Themes/_fallback/Sounds/MusicWheel collapse.redir | 1 +
 src/MusicWheel.cpp                                | 1 +
 src/WheelBase.cpp                                 | 8 ++++++--
 src/WheelBase.h                                   | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 Themes/_fallback/Sounds/MusicWheel collapse.redir

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 8cfd8c6401..c4e34a237b 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -15,6 +15,7 @@ StepMania 5.0 alpha 2 | 20120???
 set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ]
 * [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ]
 * [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ]
+* [MusicWheel, WheelBase] Added collapse sound. [AJ]
 
 StepMania 5.0 alpha 1a | 20120219
 --------------------------------------------------------------------------------
diff --git a/Themes/_fallback/Sounds/MusicWheel collapse.redir b/Themes/_fallback/Sounds/MusicWheel collapse.redir
new file mode 100644
index 0000000000..5272adb660
--- /dev/null
+++ b/Themes/_fallback/Sounds/MusicWheel collapse.redir	
@@ -0,0 +1 @@
+Common invalid
\ No newline at end of file
diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp
index 5b6af3280b..7adce9de96 100644
--- a/src/MusicWheel.cpp
+++ b/src/MusicWheel.cpp
@@ -109,6 +109,7 @@ void MusicWheel::Load( RString sType )
 
 	m_soundChangeSort.Load(	THEME->GetPathS(sType,"sort") );
 	m_soundExpand.Load(	THEME->GetPathS(sType,"expand"), true );
+	m_soundCollapse.Load(	THEME->GetPathS(sType,"collapse"), true );
 
 	// Update for SORT_MOST_PLAYED.
 	SONGMAN->UpdatePopular();
diff --git a/src/WheelBase.cpp b/src/WheelBase.cpp
index 797f422153..25753a1f45 100644
--- a/src/WheelBase.cpp
+++ b/src/WheelBase.cpp
@@ -283,11 +283,15 @@ bool WheelBase::Select()	// return true if this selection can end the screen
 		{
 			RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText;
 			if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded
+			{
 				SetOpenSection( "" ); // collapse it
+				m_soundCollapse.Play();
+			}
 			else // already collapsed
+			{
 				SetOpenSection( sThisItemSectionName ); // expand it
-
-			m_soundExpand.Play();
+				m_soundExpand.Play();
+			}
 		}
 		break;
 	default:
diff --git a/src/WheelBase.h b/src/WheelBase.h
index 0a99704dc1..dbbb786385 100644
--- a/src/WheelBase.h
+++ b/src/WheelBase.h
@@ -99,6 +99,7 @@ protected:
 
 	RageSound m_soundChangeMusic;
 	RageSound m_soundExpand;
+	RageSound m_soundCollapse;
 	RageSound m_soundLocked;
 
 //	bool WheelItemIsVisible(int n);

From 8d9517976dcae6ff2d246289a6417b8b4e156011 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 1 Mar 2012 22:42:57 -0600
Subject: [PATCH 14/14] various graphical changes to Hello World

---
 Themes/HelloWorld/Graphics/Common splash.png  | Bin 0 -> 5031 bytes
 .../Graphics/ScreenGuideMain scroll.lua       |  22 +++++++++---------
 .../Graphics/ScreenReferenceMain scroll.lua   |  22 +++++++++---------
 .../SectionMenu ItemFocused (doubleres).png   | Bin 0 -> 3054 bytes
 .../Graphics/SectionMenu ItemFocused.png      | Bin 1286 -> 0 bytes
 .../SectionMenu ItemUnfocused (doubleres).png | Bin 0 -> 2176 bytes
 .../Graphics/SectionMenu ItemUnfocused.png    | Bin 1052 -> 0 bytes
 .../HelloWorld/Graphics/_common/_generic.png  | Bin 991 -> 1067 bytes
 .../Graphics/_section Guide (doubleres).png   | Bin 0 -> 365 bytes
 Themes/HelloWorld/Graphics/_section Guide.png | Bin 273 -> 0 bytes
 .../_section Reference (doubleres).png        | Bin 0 -> 409 bytes
 .../Graphics/_section Reference.png           | Bin 297 -> 0 bytes
 .../_section Tutorial (doubleres).png         | Bin 0 -> 412 bytes
 .../HelloWorld/Graphics/_section Tutorial.png | Bin 313 -> 0 bytes
 14 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 Themes/HelloWorld/Graphics/Common splash.png
 create mode 100644 Themes/HelloWorld/Graphics/SectionMenu ItemFocused (doubleres).png
 delete mode 100644 Themes/HelloWorld/Graphics/SectionMenu ItemFocused.png
 create mode 100644 Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused (doubleres).png
 delete mode 100644 Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused.png
 create mode 100644 Themes/HelloWorld/Graphics/_section Guide (doubleres).png
 delete mode 100644 Themes/HelloWorld/Graphics/_section Guide.png
 create mode 100644 Themes/HelloWorld/Graphics/_section Reference (doubleres).png
 delete mode 100644 Themes/HelloWorld/Graphics/_section Reference.png
 create mode 100644 Themes/HelloWorld/Graphics/_section Tutorial (doubleres).png
 delete mode 100644 Themes/HelloWorld/Graphics/_section Tutorial.png

diff --git a/Themes/HelloWorld/Graphics/Common splash.png b/Themes/HelloWorld/Graphics/Common splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..c48c599d905e00c94c717ae2c35bf70862bb9903
GIT binary patch
literal 5031
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

literal 0
HcmV?d00001

diff --git a/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua b/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua
index 71946e43aa..60a721afad 100644
--- a/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua	
+++ b/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua	
@@ -4,19 +4,19 @@ local itemName = gc:GetName()
 local t = Def.ActorFrame{
 	-- focused frame
 	LoadActor( THEME:GetPathG("SectionMenu","ItemFocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0);
 	};
 	-- unfocused
 	LoadActor( THEME:GetPathG("SectionMenu","ItemUnfocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,1);
 	};
 
 	LoadActor( THEME:GetPathG("_section", "Guide") )..{
-		InitCommand=cmd(x,-244;y,-23;Real;halign,0);
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0.9);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.45);
+		InitCommand=cmd(x,-240;y,-23;Real;halign,0);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0.9);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.45);
 	};
 
 	Def.ActorFrame{
@@ -24,15 +24,15 @@ local t = Def.ActorFrame{
 			Name="SectionName";
 			Text=THEME:GetString("ScreenGuideMain",itemName);
 			InitCommand=cmd(x,-250;y,-6;halign,0;diffuse,color("#222222FF"));
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 		LoadFont("_frutiger roman 24px")..{
 			Name="SectionDesc";
 			Text=THEME:GetString("ScreenGuideMain",itemName.."Desc");
 			InitCommand=cmd(x,-248;y,10;align,0,0;diffuse,color("#222222FF");zoom,0.5);
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 	};
 };
diff --git a/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua b/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua
index d0e5e6ed14..7e7df6e825 100644
--- a/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua	
+++ b/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua	
@@ -4,19 +4,19 @@ local itemName = gc:GetName()
 local t = Def.ActorFrame{
 	-- focused frame
 	LoadActor( THEME:GetPathG("SectionMenu","ItemFocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0);
 	};
 	-- unfocused
 	LoadActor( THEME:GetPathG("SectionMenu","ItemUnfocused") )..{
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,1);
 	};
 
 	LoadActor( THEME:GetPathG("_section", "Reference") )..{
-		InitCommand=cmd(x,-244;y,-23;Real;halign,0);
-		GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0.9);
-		LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.45);
+		InitCommand=cmd(x,-240;y,-23;Real;halign,0);
+		GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0.9);
+		LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.45);
 	};
 
 	Def.ActorFrame{
@@ -24,15 +24,15 @@ local t = Def.ActorFrame{
 			Name="SectionName";
 			Text=THEME:GetString("ScreenReferenceMain",itemName);
 			InitCommand=cmd(x,-250;y,-6;halign,0;diffuse,color("#222222FF"));
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 		LoadFont("_frutiger roman 24px")..{
 			Name="SectionDesc";
 			Text=THEME:GetString("ScreenReferenceMain",itemName.."Desc");
 			InitCommand=cmd(x,-248;y,10;align,0,0;diffuse,color("#222222FF");zoom,0.5);
-			GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1);
-			LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5);
+			GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1);
+			LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5);
 		};
 	};
 };
diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemFocused (doubleres).png b/Themes/HelloWorld/Graphics/SectionMenu ItemFocused (doubleres).png
new file mode 100644
index 0000000000000000000000000000000000000000..2a62b7d8a4a49cfe3f0080bcf6ecc6a8e1dd4533
GIT binary patch
literal 3054
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
CUpLYK

literal 0
HcmV?d00001

diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemFocused.png b/Themes/HelloWorld/Graphics/SectionMenu ItemFocused.png
deleted file mode 100644
index 5f4d043bcfff094d176df4241241605a6b3cdd10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1286
zcmV+h1^N1kP)<h;3K|Lk000e1NJLTq00IC2002M;1^@s6Y`@RH00007bV*G`2ipk)
z76l$OTb(xm000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP000D)Nkl<Z
zc-rmV&2JQC90%}c-`b_LDPlmXU<{!u1W7=x7ZajM55$DTBmV#i|A2{xgBlWzH|5ZT
zgfmA^#zef3c%a0WgCH2Z7^4zUq0}O6>8|s1JIm0l5QVtxKA%rA%*;-w414+h=6NFo
z03bP~;>q}dgL|{xp=^6O+n(t5!vO&I?dNR!BHN}eo;Y?Y|FB&EWZ{3LF*x$(!gH@L
z4UTOu4~?v^luQ5R?*RZF290J2H)j7>n*a5DW8mA5E9Lpw_p&13aJ;r0@mcu4x-|6Y
zXQj!vN;@_Umj^1{eq;dPL0MP|;ryjP8;#H3Z&v26?8}OPlhu`LhZcA4Z|oi$uGPvR
zy!(6zzuyeu!*i{R7q2Z>5MloE58eJZbk*R-ZDD9+eHdTY?I!_%yDMgSe6im#HeCK@
z=l;dY^zqo$-!1?qhc@r3)K=d7;|*7`?aWta!o&*`!hc2UJJ=S&BkQ~UC;)I*tFt_2
z{MyaCs!P*hGG5OMfYJJzq4t1)kG>0G`pYxR$MG}ae_Q-6N>5I7`!N9Eu2yGxRIk@d
zb0G}J<GcU}<-$$x?8z#J9TUqp0|33JQ<fLU_Ln=|ls6mXl>-3KTke(R)#6EB863^3
zh108=4Y<vB0>H!WURhr4bko}_%?3wx0RTWxx>uIBy8w#SLEdbTR}OLd8!f&I0D8gd
zERTv=-?0Ut*lZBRx$klMTk5j`@^t_J;9<8q%U8Rj0Eo>2arxhBcJRte6QQ(HD(v2n
z{jnhnzOAOe0YI;aS>DX{w;HWwfs5J&Kn(lgS_sds3*nj35Js}&iqUQW(6g4Z(4Sol
z;rp2oE?f)k7yGDP01Q?_*taEwr$<|@0J0wddf$dMAv`q_!q#lNa5aSME1$Oq0gkO{
zg?~l(13=%1nI5x!e6*GIxpo2YSiSY;4*>L^nDHCyh4cJipzO^b0QyzT_<_pp^J?)*
z^WXnI0H6nz@Bdc-0KG;5000SUcL6kmE&u@NXT_Y?0ssIBx??F|EdT(J1}y*pkRW3K
z03Z>?oWHXRKm`B*NzerV0146s004>j=PrP5KN$e<zt92z0Ey_>0uToP8UzRc{i~Ss
z1_1&<f{XzGfCL!>004<F3jhETrvLze1nB|*fJAie0x%5_0Q#G0fB=v-T>t=(2(thH
zAaRxg27p8qb6yJo03^s5002lt=l=~bC;$MUpBV%Q0EyEA004<7=DdY~03bn@0tSFo
zbeaaJ3jhH6n=SwVNSs*!0FWSE0058(3jqN@f;uk*qyhkd{?=(0K%*)D0id5X3PGRG
z0+{*j>g+8A008u-nDH^|v)xQQ&szXa{&?>6zPT4Ct7`|k{fGd-gEqGiLYDRO+2P4}
zp0@x@{dM-!+VSa`#q0CB0sx?2#7vLb9y2~>eRet(KQHA!Fn-|Rk!EG!jiH^d-Q2Q$
zPyO*t8*4So1OY(LT5N>y%caYUKb`;j=8dzT)JsbXA6z_f>~OqRD*j+r1nkXrhq5j1
wH+B2L0f75<DceqE+f)|*r@H+x06-W04OXR6p!k{8_y7O^07*qoM6N<$f{GAEdH?_b

diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused (doubleres).png b/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused (doubleres).png
new file mode 100644
index 0000000000000000000000000000000000000000..c3686f141bdc866fa88991b0e369f19d8fec2e53
GIT binary patch
literal 2176
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

literal 0
HcmV?d00001

diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused.png b/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused.png
deleted file mode 100644
index 77cd6b9733082ce3f226e442a0a7ecc62d57e2c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1052
zcmW+!eK6Z+9RL0jZ)?3>sftqBADx*g*SdKv@pj~9l44=WwBAycS`-l#)dcI*de^dc
zt8;CmXBy1Qon3_uv8`xV#9fP=kzD1l3%Lx<Nl5bB6aPHVbKmFl`97b|_xUu^Q<I#I
zcpU)%Cu(v+8UO(uf#P6?)?%4lhBgu}F^iX8a+z0|TgHaif|5Konfgs`Av=woTToT{
ziX8<&9HS=0W?Wy|T9IFUl;~;yUyW*ICg=wSr#bEdE!;n?KH=wy+t2N3-z(zr+BmL;
z`jnh3KTgwYV#oqlmoG~@PSc|rl_Q-F6TWi_&Oq+o<Jp#Cz8gyyxoaHf-RGv3SB>pX
zPaiN|pExrJq5+<>dCX%<;9a;HRwRHNjoE8TAJ!LLW6>)Ajrpa~d3<el%fyn%$M_pv
ze&VdCD$~1LeD(t5FrDIiEJBk}Ua7*b?M*)P4RYFNW#%~yg^=LlqwKJqSNkV*vr)KV
zbt@(EX08(To^YI7A`LQCCY}_3XRp&sapjGgHB;oGW>mLG6W6e>272IMP58n<Ge^*^
z4SL}vT<^$~rp@$g1i0h)@O*keIl}@?k_@%@{PVJ{JG7XHP!ild#bVM;7&+f1aJE97
zB+brLvp^fsXE_b<k};aOvH9Cd_ZRl?po4Q1fPN9?Fc9s$b!&i1x7u(_WFk^JhyaNZ
zrZbR@D0G7inwGG0+v3#oW1j$|^nb*##J=HZLtGr7ODV79BXm>4`#c%9N2^`Wc_@@E
zOM;FI;bnUF_R4-V*4AzyQWhfij=~_4RibA4I-epquG_)D;<uCK0Bs>3+F$@S0Aw8I
z6a)|vBCT<GASs%ZLY%?}D18C==zc$X$JP!jM2x7J+Cb4y_83N42*59Zrv^o<)<^Ud
zrD~#r;7za*osEQ9RP+zP%{Dp6=ii&)Sb>;B&XhOTNv`0oz&sre?YAfh$;B8@EZ^Oy
z5qPL}HdH{O=UX|iF)q3&bpjm{b*$<H(&PzNZ1|rE*0F&P(tO}dIh<gfC|(5gCzlT$
z<S{Jm&}J3Phh?iHB1P>1;GUncQJ;hnkyuy+tnG!(A!Y#&jwUvRA-HjuOoopKh{4<B
zHp8!oQIKuGPr_$H)yTO;?@O({(=Jfp*SnqHtDCx~b)9U0{%qAyX?5Y1Iv^)?O-h(z
z&drt~+iMl-P5HWPf159?zTyW^#xzQno^Wn->$}z)T$%Gbx9+sdhQFSF94cm28~f)A
z8TX<EtIftiGe8UTuPn20SpUz$Oi2ls`#w76SnD4L^&M-U`@5&ui3$Sm>PO{n&z#|z
zvNudnw5Dnm_Jnr+j`M9J8Z4dCP!KH_n@27gbRPu6k8cA%rS5v6e*vH-rY7{o<<$KT
DWaz;9

diff --git a/Themes/HelloWorld/Graphics/_common/_generic.png b/Themes/HelloWorld/Graphics/_common/_generic.png
index 687ff39b0aed18a337ee2e61347e75b1b1c4de18..db0e2428dc2ba45539aea6aa27d1735594a31892 100644
GIT binary patch
delta 968
zcmV;(12_EN2dfB>VjtWC0t6y5EbV*K00009a7bBm000W`000W`0Ya=an2~`Ke}YLw
zK~#9!?VCGt+dvG4<(wf^D!a=OGHILxxbg`+Ifn`rIY-7PaFqktO~yxXr&OwZhs2-)
z2?nuCyml>9!VE{IOoID=0<pUwcd<Cxaobtft9?BGt2*xaPq%jU0|4T`-t6~(-!69h
z^l#kn1fdUrn)uRpoglOaAc_Bee=8sR^QJq5wg4>R-v~lG03Pvg0HF<li1^MB@&ROs
z?+D>TbMZXeTMW(xA9P<kmgo)u8V0}g=WjXUB?#afu8{~K2LOskqrX~~QJ;wr;sCgK
zxNl(}whR!MLtq2n$q-@yO5$lFBM^83Z2-ZaQ6=%qwS4T43tu;=^#{i~e|rZX0E>7J
z1dl%_1UmqacngGxKL-RGfQWbvgbaU12zme+;%TF$>2SoK6N0W6;3GVq?XAXphsbal
z{n6gRFk+mhR2$oWy7V=8^RWHIMrZmn&K>FzAc;S8GtM2#07?@Z*l4(U?ZwCH*Lv8p
z{O#IjfFOs5wuTo-T7&q<f9>w-%gc6kk)Ko*x5F5KwT9>Dwy1bCH-xEfbppa`0Nxs&
zVc^1l`Qg(W3EF{G1;QRcw1%e`x=P~F%n+<Y>jDHh30nJQI2IbD6i)?9e-DXq!k@W)
zg&u4i0nr*BKNqw8qs`SW5(IzY8e=g6GHQ6VOGEK@4`x?z&Zvvzf1&JYABzMz2Vh;#
zYESpu&;J)0iPw(wHv4l{*O%K!Kml3ptLA_t8-@Kw5ee)V>#bw8@huQFTEl~6#ea1W
zD1nf^hjTIEW!4yr0EBzQB_6E=feJ1Gq2j5(X!}?Wk#m6eQC6*n2mjOD0#tl<jgjiB
z<^b!2XKEm{T$dxke<~jRS=(3WJ@x>A2%kl1E}|U@FUjBrvoSUNZc4lrf_f;7)?qR<
z_~Q_uYim(sG);zT5L(pm5Q0}c_2--p%Q-;09a_}zKsbuet}!Z0WA&O~sU&vDH9;^#
zU9dh9lp^8KEww1hA>i}*>>6H{KmLA#;@QB_KNvYZ8naz3e+c2-KOBufn9bvH4}{sh
zAW?&mUBjF57Z48?s|dk``8zw=H9YPwQ9M}ATbEKKpa8I>8e_J2u$-D8kAxN@M*e<6
z(krvM?+TY@k&y^!ypSTdDm*odv|5K%B&XNqn*fMHc=rn?A`oV?WX1zwc8jKJ5RPWq
qoCd<|7fw<L9vbVoboOM&ZvOy|^8z7}=6SII0000<MNUMnLSTa2_PTcf

delta 891
zcmV->1BCpm2;T>gVjtTH3K0r6{xNV300009a7bBm000XT000XT0n*)m{E>kZe>O=(
zK~#9!?VG<*!!Q)a4aW#nRHS1BE)5L85FB%)aFIE38G-?z$z=pOsHoTh@{)+ivYzz*
zNlBc1cR6fhKkNJ1vg9YZY0f%rT~s~W_3bZdzn`ya<*Ek&%#WXU>x+5Qyv#Stv(@(S
zf0ZEA0gy89v?mDV0Z`2E5kgr2e;o6Bf=~{C#QYv0lmVbIUm1cu01NXKA=m=2G+zmV
z9RM)z%znJtm=7V`J?_?xAY7W82Q7?@`|@MLxv0I$jPw*k^Kf-0pPS|B$fgQl@eJ++
z9e|X1Ck+HjJS7A<0E&4H1Wr5!1Q`I1c?kqbJRt-=0Eu}H1Wh~v1Rem5e|ZW7i+D^3
zbO09SQxGiUF(A<T0bvhMQ&<ojJ1ZCu%1Z1f<SE6vx0=HGf-C0?SjA&@o6~nd%>1Ft
zFC*bj!0F_2c-pJBx?1h)CPw=-GKnY2F~$K<b9jn}7MO3Bo7MJS2?2Yk5+L*eaC3Nq
zX3ID4B!-Y{Rx=Q~0HirQe@4e8yz=Y6(mR3Lu}VPL0np~~2wm5hc_%gmZr2)t5N`#z
z$qd-nHE9I%zTw#N`r(*~$1Wezg7pDNGdUOpq|X1F#kOM*q_5Wqgl-jZJ8BdpFfj8J
z^{Rtaf(5j#0$l)>IlQJ(neRaWS(a}L;L0W<Qg|@`{l439^FTY$e><jK5|0t8cokSL
z`w%b~*gn&;RiOJ2gr>rOtJ0VUO|}oR*p&yv{x4_V#nYB=+&#YE3P>SfeSs7NOfmCX
z2odvf01^nfjt~bz%DfZ;V!jIi>O}Y|NjV9%D?IVqbr?B<pOe3yGtY%U?g~3qco|y9
z^8tWh*sDa2k@Ygfe}Q0;!*dX%=2H;Fufr4wMhTIk@l*+s6a>&A=LA8FykI&f7<(`t
zx|m5(+PHwb6a4Y{L#_gDega`^fHp1=-U+$)e@<ab#AD1NIS-BT&ZdNL^n;@s2!k0O
zmp~ZY1PKm=!A_B(Kp6ZasT2f|agNd2JjiCAAQU7VpSM;xQ9r?GqU3q1tSJC%2uC+r
z+7iOiPM5cUaP%KcXdn#clNkww!F@EvfiT$5<|q&b|KX$$fuf3^&YpGZ`U4}%={&ub
RV^{zH002ovPDHLkV1hwbiTwZo

diff --git a/Themes/HelloWorld/Graphics/_section Guide (doubleres).png b/Themes/HelloWorld/Graphics/_section Guide (doubleres).png
new file mode 100644
index 0000000000000000000000000000000000000000..a77e8ffefcc64bc345800be09eec6b01dd8d835b
GIT binary patch
literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^4nQoy!3HF~w)}PhQaUBB5hcz=sfi_-`FRQ<nYpP9
z;i)MKM#c(msYwb(28M<T28LFKMpj0q3c3bn1_qmFTl)d^v6p!Iy0YJ4W@6El5LuLc
z4k*M~;1OBOz`*qZgc+UIn9KkQvZOouIx;Y9?C1WI$O_~i@pN$vskoJ#Ai=sgL8K?;
zzzV6E-|830I;v%~T>3gi;*iOOeG(Z5n3C^AnN3#d%?f-O@%7-5!kOM4@*CeVta9(H
zEV^qyi>bhK!SN>!j4_&AZjX!9H@=hiW&B@Pdt8fAc>m@!!LZ7y6D;=pDqwW_7I@kw
zCY9;T-SX>tX)G5PYc@<^is*Rg#n~+Sz-ytw0vQ?Zy#GDR7-EE;9JAOO%(XIAVB@=n
zm+~Jq8v^ec7p(ZkDs>@a(}50uMv!Zp0u8v_j2IaH?etmC>$PbM&_4{Gu6{1-oD!M<
D`2>J<

literal 0
HcmV?d00001

diff --git a/Themes/HelloWorld/Graphics/_section Guide.png b/Themes/HelloWorld/Graphics/_section Guide.png
deleted file mode 100644
index 071f4e83e9d9ceea1303e78c0d7ccb707c49f5e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k!3HE}wEkTWq;yJLBTAf$QWHxu^Yau!GILWI
z!c$WejEoiBQj-*n3=9nw3=FLdjjW7J6?6^E3=B5Uw)O++V=wXab!ETJ$t5VqBR0A2
z6;Oz?z$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl|#@N{tuskoIK((Cj4yo2=x
zjw4?yLK|cnxD`$}-gr@ylT-4y<xIL`Sx;1m)zP@NnT6RmeGJ^pglGTMdBLRMd!<Cc
zZgal={G%NY878o7a>`;V;ZJm7wCnCH71<}?V$Q5`-r~W|gawQYMsp{{|B7SY2(**I
M)78&qol`;+06ODVC;$Ke

diff --git a/Themes/HelloWorld/Graphics/_section Reference (doubleres).png b/Themes/HelloWorld/Graphics/_section Reference (doubleres).png
new file mode 100644
index 0000000000000000000000000000000000000000..fb870063a6c110a34800a41a93e31fd195fd0ce1
GIT binary patch
literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^4L~fx!3HFaxW7IHQaUBB5hcz=sfi_-`FRQ<nYpP9
z;i)MKM#c(msYwb(28M<T28LFK23DpP3c3bn1_pO(npXk!v6p!Iy0YJ4W@6Ehdc56w
zF;IxJz$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl}Q;OXKRQgQ3;&AnWQ3<M4o
zYFF~J+uu7HSQ2<4aQ?~AgPw(7VqMthI~4>hkM_D`qN}p-`+wg{k1ut{=ui1p#lYaO
zIBCzFe?j7nCBIg3J4CtF-SPju;K<1=_c-=XGZ;=uhC5ifTzR{pC@yy8=cM=g)BjKA
zTrlTn-MwoKG4*r!r+zdFPwy9-eab26`O$mxvu)#J*4gVHKO`o9?)tUu7V&d8$q74H
z3eS4*x+LCa`kouVvrm6rV!k%`S~8P{xDDfzGbN=nUi*mdJI7=D`qn-DZ~vT3_r~9~
zQEMnVnqYPMRrG<^Wn29k?!0=#r3UmX1H+0>>>mwVeE%~q*9UPuUHx3vIVCg!09m`D
AVgLXD

literal 0
HcmV?d00001

diff --git a/Themes/HelloWorld/Graphics/_section Reference.png b/Themes/HelloWorld/Graphics/_section Reference.png
deleted file mode 100644
index a5d7c0b2b2edf821fd944e778c5ceaedc743c2d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4nWMo!3HEflYZU@QaUBB5hcz=sfi_-`FRQ<nYpP9
z;i)MKM#c(msYwb(28M<T28LFK23DpP3c3bn1_pO(npXk!v6p!Iy0YJ95@#1-&^WaF
z7Ep+@z$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl{q@N{tuskoIK((Cj4yul<!
z4Tgfoi3-P?WF)czUncyzwrQpWBkSbDY#LLQuiItqn9Lf>Fni&PM=#hWYP+wiZ8`Av
z>1K(<oF_Vcd1@ZA+<MLzbeFnvDO|U6VhG>amZugWTO{XrUjN85-4brki$EPe&L|%B
lam%{Ov}4j;4T&cV42)La{bh;`jse}m;OXk;vd$@?2>>4QV8Z|a

diff --git a/Themes/HelloWorld/Graphics/_section Tutorial (doubleres).png b/Themes/HelloWorld/Graphics/_section Tutorial (doubleres).png
new file mode 100644
index 0000000000000000000000000000000000000000..788ce5d67e05388b859c0b5a84bb50c728530710
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^IY2DI!3HGduS!S(DV-A6h!W?b)Wnj^{5*w_%-mFl
z@YECqBVz@()FcHX14Bav14AoAV=EJ51ziI(1B0K>a?S$vv6p!Iy0YJ4W@6D4`z+;l
z5-7x3;1OBOz`*qZgc+UIn9KkQvZOouIx;Y9?C1WI$O`0t_H=O!skrs_hBX(Hp#a+h
zmm+>{`SOh-xguMx7-z0r(3|u!wnk*0(}n;?iS8Yb)e7&FKKVaus;aT@w7-WJ83IkP
zy6Ki*qFpVVaHh_3tKw^|)O?Xg7QZ$|`z+#`{kJep_U`jvMWri0cdh#!wm-mQhSB+!
zRyF6YD|`0XT`G0``dA_Hl*RwoORh<#)S1TVKR^C;$GqDUO6T0L3;Mj{cl%YHmFK2U
zUvZ;OM#V?+du8|kp!a;PuXa2s+9BL>!LzwVQ+eKo8|JUCKMUM{Wr^qe`}f&}mYq5M
zKm2Og@3)avxAJmM?6O%{yX0A>`*}uAW}s^s0^alecWawc_+a-P5ZBYy&t;ucLK6V(
CyQW<L

literal 0
HcmV?d00001

diff --git a/Themes/HelloWorld/Graphics/_section Tutorial.png b/Themes/HelloWorld/Graphics/_section Tutorial.png
deleted file mode 100644
index a0fc39758c1cf40fb47df4dc7149ba54a4b507d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^W<bor!3HEZneqTh2AvYuh!W?b)Wnj^{5*w_%-mFl
z@YECqBVz@()FcHX14Bav14AoAV=EJ51ziI(1B0K>a?S$vv6p!Iy0YJ95@#0_TbTIk
z98id}z$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl|F;OXKRQgJIeq}S*7d4nSd
z-#*<eVaVbrcbIj;Q-_=qJHuZmrYgJ2nw{U&z_E2jiNW)0n`ZKysBvnLsC|*uF;&@J
z)+m9=Re9TrBT{=^Rw%m38z~&ys9?IJf{P`>BgogeL4T@1m*JNu99%JrY~8XtCa&UN
z(sx6r;e5>u$qy;bXRo(-`Q&7ETy)QN$SRWn2Fc&~pZ`vB)OZGT8-u5-pUXO@geCw}
CC~1fQ