diff --git a/stepmania/Themes/default/BGAnimations/ScreenEditMenu in.redir b/stepmania/Themes/default/BGAnimations/ScreenEditMenu in.redir
index 6ae5badc96..796793e912 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenEditMenu in.redir	
+++ b/stepmania/Themes/default/BGAnimations/ScreenEditMenu in.redir	
@@ -1 +1 @@
-_fade and swoosh in
+_options to options
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptionsEdit in.redir b/stepmania/Themes/default/BGAnimations/ScreenOptionsEdit in.redir
new file mode 100644
index 0000000000..0f6547301b
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenOptionsEdit in.redir	
@@ -0,0 +1 @@
+_options to options
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptionsEdit out.redir b/stepmania/Themes/default/BGAnimations/ScreenOptionsEdit out.redir
new file mode 100644
index 0000000000..0f6547301b
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenOptionsEdit out.redir	
@@ -0,0 +1 @@
+_options to options
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua
deleted file mode 100644
index 193cdd7e5a..0000000000
--- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua	
+++ /dev/null
@@ -1,12 +0,0 @@
--- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table.
-t =  Def.ActorFrame {};
-t[#t+1] = StandardDecorationFromFile( "LeftFrame", "LeftFrame" );
-t[#t+1] = StandardDecorationFromFile( "RightFrame", "RightFrame" );
-t[#t+1] = StandardDecorationFromFile( "Header", "Header" );
-t[#t+1] = StandardDecorationFromFile( "Footer", "Footer" );
-t[#t+1] = StandardDecorationFromFileOptional( "Help", "Help" );
-t[#t+1] = StandardDecorationFromFileOptional( "StyleIcon", "StyleIcon" );
-t[#t+1] = StandardDecorationFromFileOptional( "StageFrame", "StageFrame" );
-t[#t+1] = StandardDecorationFromFileOptional( "StageDisplay", "StageDisplay" );
-return t;
-
diff --git a/stepmania/Themes/default/Graphics/ScreenEditMenu LeftFrame.redir b/stepmania/Themes/default/Graphics/ScreenEditMenu LeftFrame.redir
deleted file mode 100644
index 04b2ead777..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEditMenu LeftFrame.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEditMenu RightFrame.redir b/stepmania/Themes/default/Graphics/ScreenEditMenu RightFrame.redir
deleted file mode 100644
index 04b2ead777..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEditMenu RightFrame.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEditMenu header.lua b/stepmania/Themes/default/Graphics/ScreenEditMenu header.lua
deleted file mode 100644
index 14966c8743..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEditMenu header.lua	
+++ /dev/null
@@ -1 +0,0 @@
-return LoadActor( THEME:GetPathG("", "_header"), 'Edit Steps' );
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenEditMenu page.redir b/stepmania/Themes/default/Graphics/ScreenEditMenu page.redir
deleted file mode 100644
index 04b2ead777..0000000000
--- a/stepmania/Themes/default/Graphics/ScreenEditMenu page.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 5dc8973521..d0075c2559 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -141,7 +141,7 @@ Edit Steps=Edit Steps
 Jukebox=Jukebox
 Log In=Log In
 Network Options=Network Options
-Packages=Packages
+Export Packages=Export Packages
 Select Character=Select Character
 Select Course=Select Course
 Select Difficulty=Select Difficulty
@@ -290,6 +290,7 @@ Center Image=Center the image on your monitor.
 Characters=Characters
 Clear Bookkeeping Data=Clear all coin drop data.
 Clear Machine Edits=Save all step edits saved to this machine.
+Clear USB edits=Clear USB edits
 Clear Machine Stats=Clear all scores saved to this machine.
 CoinMode=When set to HOME, options will be shown on the title screen. When set to PAY the title menu choices are hidden and you must insert coins before joining in.  When set to FREE the title menu choices are hidden and you can join in without inserting coins.
 CoinModeNoHome=When set to PAY you must insert coins before joining in.  When set to FREE you can join in without inserting coins.
@@ -311,6 +312,8 @@ DisplayAspectRatio=Change the width-to-height ratio of graphics in the game.  Mo
 DisplayColorDepth=Choose the color depth of the window. This option may not take effect in windowed mode.
 DisplayResolution=Choose the output resolution.  A higher resolution will show more detail, but requires a faster video card.
 EasterEggs=Enable or disable some special easter eggs.
+Edit Courses=Edit Courses
+Edit Songs/Steps=Edit Songs/Steps
 EditorShowBGChangesPlay=Choose whether to display song backgrounds while playing.
 Effect=Effect
 EnableAttackSounds=If enabled, a sound effect will play when an attack begins or ends.
@@ -358,7 +361,7 @@ PlayerAutoPlay=PlayerAutoPlay
 PreloadSounds=If YES, preload most sounds in advance.  This increases load times, and should normally be left OFF.
 Premium=Premium
 Profile=
-Packages=Export .smzip packages of your installed songs.
+Export Packages=Export .smzip packages of your installed songs.
 Profiles=Edit the player profiles stored on this machine.
 ProgressiveLifebar=Set whether the lifebar is harsher on consecutive boo/miss judgments. OFF for no effect, 8 to make each consecutive miss a multiple of the first miss.
 ProgressiveNonstopLifebar=Determine whether the lifebar gets harsher as a nonstop course progresses.  LifeDifficulty + this = Lifedifficulty on a final stage of a course.
@@ -407,6 +410,8 @@ TextureColorDepth=Choose the color depth of textures. 32 bit texture use more me
 Theme=Choose from this list of installed theme packs.
 TimingWindowScale=Increase this value to cause your steps to be judged more strictly (i.e. shrink the timing window).
 Turn=Turn
+Transfer Edits to USB=Transfer Edits to USB
+Transfer Edits from USB=Transfer Edits from USB
 UseUnlockSystem=Enable or disable unlock system.
 Vsync=Cap your frame rate your display's refresh rate.  This option only has an effect when the Display Mode is set to &oq;Full Screen&cq;.
 WideScreen16_9=Enable widescreen display.
@@ -707,6 +712,7 @@ Choose=Choose
 Clear Bookkeeping Data=Clear Bookkeeping Data
 Clear Machine Edits=Clear Machine Edits
 Clear Machine Stats=Clear Machine Scores
+Clear USB edits=Clear USB edits
 Clear area=Clear area
 CoinMode=Coin Mode
 CoinModeNoHome=Coin Mode
@@ -736,7 +742,8 @@ DisplayColorDepth=Display Color
 DisplayResolution=Display Resolution
 Duration seconds=Duration seconds
 EasterEggs=Easter Eggs
-Edit=Edit
+Edit Songs/Steps=Edit Songs/Steps
+Edit Courses=Edit Courses
 Edit BPM change=Edit BPM change
 Edit song info=Edit song info
 Edit steps information=Edit steps information
@@ -831,7 +838,7 @@ Predicted Meter=Predicted Meter
 Preferences=Preferences
 PreloadSounds=Preload Sounds
 Premium=Premium
-Packages=Packages
+Export Packages=Export Packages
 Profile=Profile
 Profiles=Profiles
 ProgressiveLifebar=Progressive Lifebar
@@ -907,6 +914,8 @@ TextureColorDepth=Texture Color
 Theme=Theme
 TimingWindowScale=Judge Difficulty
 Transform=Transform
+Transfer Edits to USB=Transfer Edits to USB
+Transfer Edits from USB=Transfer Edits from USB
 Type=Type
 Turn=Turn
 Undo=Undo
@@ -1120,6 +1129,8 @@ Preview Start=Preview Start
 Preview Length=Preview Length
 
 [ScreenEditMenu]
+HeaderText=Edit Song/Steps
+HeaderSubText=Make your songs perfect
 Continue with delete?=Continue with delete?
 Enter a description for this edit.=Enter a description for this edit.
 ExplanationAction=In this mode, you can edit existing notes patterns, create note patterns, or synchronize notes with the music.
@@ -1426,7 +1437,7 @@ Gametype:=Gametype:
 Difficulty:=Difficulty:
 Announcer=Announcer
 Play Online=Network Play
-Edit Mode=Edit Mode
+Edit/Share=Edit/Share
 Exit=Exit
 Game Start=Game Start
 Jukebox=Jukebox
@@ -1971,4 +1982,8 @@ FullComboW1=Full Fantastic Combo!!!
 
 [ScreenOptionsExportPackage]
 HeaderText=Export Package
-HeaderSubText=Share with the world!
\ No newline at end of file
+HeaderSubText=Share your creation with people
+
+[ScreenOptionsEdit]
+HeaderText=Edit/Share
+HeaderSubText=Show your creativity
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index c44c45bfc4..c7b0e2b255 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -96,7 +96,7 @@ Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
 Choice2="screen,ScreenNetworkOptions;text,Play Online"
 Choice3="screen,ScreenSelectGame;text,Select Game"
 Choice4="screen,ScreenOptionsService;text,Options"
-Choice5="screen,ScreenEditMenu;text,Edit Mode"
+Choice5="screen,ScreenOptionsEdit;text,Edit/Share"
 Choice6="screen,ScreenJukeboxMenu;text,Jukebox"
 Choice7="screen,ScreenExit;text,Exit"
 Choice8="screen,ScreenTest;text,Sandbox"
@@ -1534,7 +1534,7 @@ MeterY=SCREEN_CENTER_Y-20
 SourceMeterX=SCREEN_CENTER_X+170
 SourceMeterY=SCREEN_CENTER_Y+60
 RowLabelsX=SCREEN_CENTER_X-250
-RowLabelOnCommand=zoom,0.7
+RowLabelOnCommand=shadowlength,2;
 RowValue1X=SCREEN_CENTER_X
 RowValue2X=SCREEN_CENTER_X+60
 RowValue3X=SCREEN_CENTER_X+60
@@ -1542,7 +1542,7 @@ RowValue4X=SCREEN_CENTER_X
 RowValue5X=SCREEN_CENTER_X+60
 RowValue6X=SCREEN_CENTER_X
 RowValue7X=SCREEN_CENTER_X+60
-RowValueOnCommand=zoom,0.7
+RowValueOnCommand=shadowlength,2;
 Row1Y=SCREEN_CENTER_Y-160
 Row2Y=SCREEN_CENTER_Y-110
 Row3Y=SCREEN_CENTER_Y-60
@@ -1555,17 +1555,17 @@ Row7Y=SCREEN_CENTER_Y+100
 Fallback="ScreenWithMenuElements"
 Class="ScreenEditMenu"
 NextScreen="ScreenEdit"
-PrevScreen=ScreenTitleBranch()
+PrevScreen="ScreenOptionsEdit"
 EditMenuType="EditMenu"
 ExplanationX=SCREEN_CENTER_X
-ExplanationY=SCREEN_BOTTOM-70
-HelpText=
-ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
+ExplanationY=SCREEN_BOTTOM-56
+ExplanationOnCommand=wrapwidthpixels,600;shadowlength,0;
 NumStepsLoadedFromProfileX=SCREEN_RIGHT-180
 NumStepsLoadedFromProfileY=SCREEN_TOP+42
 NumStepsLoadedFromProfileOnCommand=visible,false
 ShowStyleIcon=false
 TimerSeconds=-1
+HelpText=ScreenString("HelpTextOptionsAndBack")
 
 [ScreenJukeboxMenu]
 Class="ScreenOptionsMaster"
@@ -3211,6 +3211,7 @@ Row8Y=SCREEN_CENTER_Y+120
 [EditCoursesSongMenu]
 Fallback="EditCoursesMenu"
 
+; A simple list screen used outside of game mode
 [ScreenOptionsSimple]
 Fallback="ScreenOptionsMaster"
 NumRowsShown=9
@@ -3223,6 +3224,12 @@ CursorOnCommand=visible,false
 OptionRowNormalMetricsGroup="OptionRowSimple"
 OptionRowExitMetricsGroup="OptionRowSimpleExit"
 SeparateExitRowY=SCREEN_CENTER_Y+142
+LightsMode="LightsMode_MenuStartAndDirections"
+TimerOnCommand=visible,false
+ShowStyleIcon=false
+TimerSeconds=-1
+AllowOperatorMenuButton=false
+HelpText=ScreenString("HelpTextOptionsSimpleAndBack")
 
 [OptionRowSimple]
 Fallback="OptionRow"
@@ -3238,32 +3245,19 @@ FrameLoseFocusCommand=diffuse,1,1,1,1;stopeffect
 Fallback="OptionRowSimple"
 ItemOnCommand=visible,false
 
-[ScreenOptionsServiceSelectionList]
-Fallback="ScreenOptionsSimple"
-LightsMode="LightsMode_MenuStartAndDirections"
-TimerOnCommand=visible,false
-ShowStyleIcon=false
-TimerSeconds=-1
-AllowOperatorMenuButton=false
-HelpText=ScreenString("HelpTextOptionsSimpleAndBack")
-; This NextScreen is only used for the "exit" choice.
-NextScreen="ScreenOptionsService"
-PrevScreen="ScreenOptionsService"
-
 [ScreenOptionsService]
 Class="ScreenOptionsMaster"
-Fallback="ScreenOptionsServiceSelectionList"
+Fallback="ScreenOptionsSimple"
 ; This NextScreen is only used for the "exit" choice.
 NextScreen=ScreenTitleBranch()
 PrevScreen=ScreenTitleBranch()
-LineNames="1,2,3,4,5,6,7,8,9"
+LineNames="1,2,3,4,5,6,8,9"
 Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
 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"
-Line7="gamecommand;screen,ScreenOptionsExportPackage;name,Packages"
 Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
 Line9="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
 GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenMapControllers,ScreenOptionsGraphicsSound,ScreenOptionsAdvanced,ScreenOptionsManageProfiles,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput"
@@ -3274,7 +3268,6 @@ Fallback="ScreenOptionsMaster"
 LightsMode="LightsMode_MenuStartAndDirections"
 NavigationMode="normal"
 InputMode="together"
-IconsOnCommand=x,-30
 TimerOnCommand=visible,false
 ShowStyleIcon=false
 TimerSeconds=-1
@@ -4407,6 +4400,39 @@ Names="1,2,3"
 3Difficulty="Difficulty_Invalid"
 3String="HalfDouble"
 
+[ScreenOptionsEdit]
+Class="ScreenOptionsMaster"
+Fallback="ScreenOptionsSimple"
+; This NextScreen is only used for the "exit" choice.
+NextScreen=ScreenTitleBranch()
+PrevScreen=ScreenTitleBranch()
+LineNames="1,2,3,4,5,6"
+Line1="gamecommand;screen,ScreenEditMenu;name,Edit Songs/Steps"
+Line2="gamecommand;screen,ScreenOptionsExportPackage;name,Export Packages"
+Line3="gamecommand;screen,ScreenOptionsManageWorkouts;name,Edit Courses"
+Line4="gamecommand;screen,ScreenServiceActionCopyEditsMachineToMemoryCard;name,Transfer Edits to USB"
+Line5="gamecommand;screen,ScreenOptionsGraphicsSound;name,Transfer Edits from USB"
+Line6="gamecommand;screen,ScreenOptionsAdvanced;name,Clear USB edits"
+
 [ScreenOptionsExportPackage]
 Class="ScreenOptionsExportPackage"
-Fallback="ScreenOptionsServiceSelectionList"
+Fallback="ScreenOptionsSimple"
+PrevScreen="ScreenOptionsEdit"
+NextScreen="ScreenOptionsEdit"
+
+[ScreenOptionsEditChild]
+Fallback="ScreenOptionsServiceChild"
+PrevScreen="ScreenOptionsEdit"
+NextScreen="ScreenOptionsEdit"
+
+[ScreenServiceAction]
+Class="ScreenServiceAction"
+Fallback="ScreenOptionsEditChild"
+
+[ScreenServiceActionCopyEditsMachineToMemoryCard]
+Fallback="ScreenServiceAction"
+Actions="CopyEditsMachineToMemoryCard"
+
+[ScreenServiceActionCopyEditsMemoryCardToMachine]
+Fallback="ScreenServiceAction"
+Actions="CopyEditsMemoryCardToMachine"