diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini
index 4ed4757a0a..e14607edc2 100644
--- a/stepmania/Themes/default/Languages/en.ini
+++ b/stepmania/Themes/default/Languages/en.ini
@@ -9,10 +9,7 @@ Couldn't find 'Songs'=Couldn't find 'Songs'
 
 [CSMPackageInstallDlg]
 Could not open file '%s'.=Could not open file '%s'.
-You have chosen to install the package:=You have chosen to install the package:
-The package will be installed in the following program folder:=The package will be installed in the following program folder:
-Installing '%s'.  Please wait...=Installing '%s'.  Please wait...
-This package contains the following files:=This package contains the following files:
+Installing.  Please wait...=Installing.  Please wait...
 '%s' is not a valid zip archive.='%s' is not a valid zip archive.
 Error opening source file '%s': %s=Error opening source file '%s': %s
 Error opening destination file '%s': %s=Error opening destination file '%s': %s
@@ -232,6 +229,7 @@ Background Options=Change options that control the backgrounds that play during
 BarDrain=BarDrain
 BatLives=BatLives
 Bookkeeping=Check coin drop statistics.
+Calibrate Machine Sync=Calibrate the audio synchronization.
 CelShadeModels=CelShadeModels
 Center Image=Center the image on your monitor.
 Characters=Characters
@@ -611,6 +609,7 @@ Background Options=Background Options
 BarDrain=Bar\nDrain
 BatLives=Bat\nLives
 Bookkeeping=Bookkeeping
+Calibrate Machine Sync=Calibrate Audio Sync
 CPUSkill=CPU\nSkill
 CelShadeModels=Cel-shaded\nModels
 Center Image=Center Image
@@ -1454,7 +1453,6 @@ Total Strings:=Total Strings:
 
 [Tools-StepMania Tools]
 Close=Close
-Edit Installations=Edit Installations
 Export As Individual=Export As Individual
 Export As One=Export As One
 Export Packages=Export Packages
@@ -1498,11 +1496,15 @@ OK=OK
 Cancel=Cancel
 Note: leave off the ".smzip" extention=Note: leave off the ".smzip" extention
 
-[Tools-StepMania Tools]
+[Tools-Install a package]
 Finish >=Finish >
 Cancel=Cancel
 < Back=< Back
 Install a package=Install a package
+Edit Installations=Edit Installations
+You have chosen to install the package:=You have chosen to install the package:
+This package contains the following files:=This package contains the following files:
+The package will be installed in the following program folder:=The package will be installed in the following program folder:
 
 [PlayerNumber]
 P1=P1
diff --git a/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.ogg b/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.ogg
new file mode 100644
index 0000000000..f1d3122878
Binary files /dev/null and b/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.ogg differ
diff --git a/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm b/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm
new file mode 100644
index 0000000000..2f84982fb9
--- /dev/null
+++ b/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm	
@@ -0,0 +1,70 @@
+#TITLE:syncbeat;
+#SUBTITLE:;
+#ARTIST:Unknown artist;
+#TITLETRANSLIT:;
+#SUBTITLETRANSLIT:;
+#ARTISTTRANSLIT:;
+#GENRE:;
+#CREDIT:;
+#BANNER:;
+#BACKGROUND:;
+#LYRICSPATH:;
+#CDTITLE:;
+#MUSIC:ScreenGameplaySyncMachine music.ogg;
+#OFFSET:-0.020;
+#SAMPLESTART:0.000;
+#SAMPLELENGTH:12.000;
+#SELECTABLE:YES;
+#BPMS:0.000=132.000;
+#STOPS:;
+#BGCHANGES:;
+#KEYSOUNDS:;
+
+//---------------dance-single - Blàáñk----------------
+#NOTES:
+     dance-single:
+     Blàáñk:
+     Beginner:
+     1:
+     0.302,0.205,0.000,0.000,0.000:
+  // measure 1
+1000
+0001
+1000
+0001
+,  // measure 2
+1000
+0001
+1000
+0001
+,  // measure 3
+1000
+0001
+1000
+0001
+,  // measure 4
+1000
+0001
+1000
+0001
+,  // measure 5
+1000
+0001
+1000
+0001
+,  // measure 6
+1000
+0001
+1000
+0001
+,  // measure 7
+1000
+0001
+1000
+0001
+,  // measure 8
+1000
+0001
+1000
+0001
+;
diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index bc87792f7c..8ef468273d 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -207,6 +207,14 @@ function ModeMenuAvailable()
 	return true
 end
 
+function ScreenGameplaySyncMachineNext()
+	if GAMESTATE:IsSyncDataChanged() then
+		return 'ScreenSaveSync'
+	else
+		return 'ScreenOptionsService'
+	end
+end
+
 -- (c) 2005 Glenn Maynard, Chris Danford
 -- All rights reserved.
 -- 
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index d8e40bfd69..c5b6e1ac7e 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3714,7 +3714,7 @@ StyleIcon=0
 TimerSeconds=0
 
 AllowOperatorMenuButton=0
-LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
+LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
 # This NextScreen is only used for the "exit" choice.
 Line1=gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options
 Line2=gamecommand;screen,ScreenBackgroundOptions;name,Background Options
@@ -3731,6 +3731,7 @@ Line12=gamecommand;screen,ScreenOtherOptions;name,Other Options
 Line13=gamecommand;screen,ScreenNetworkOptions;name,Network Options
 Line14=gamecommand;screen,ScreenReloadSongs;name,Reload Songs
 Line15=gamecommand;screen,ScreenTestInput;name,Test Input
+Line16=gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync
 
 [ScreenOptionsServiceChild]
 Fallback=ScreenOptionsMaster
@@ -4244,6 +4245,9 @@ Fallback=DifficultyMeter
 [ScreenGameplayMultiplayer DifficultyMeterP1]
 Fallback=DifficultyMeter
 
+[ScreenGameplaySyncMachine DifficultyMeterP1]
+Fallback=DifficultyMeter
+
 [ScreenEdit]
 PrepareScreens=@GetEditModeSubScreens()
 GroupedScreens=@GetEditModeSubScreens()
@@ -4625,6 +4629,17 @@ PlayerScoreListY=SCREEN_BOTTOM-36
 PlayerScoreListOnCommand=draworder,-1;addy,150;sleep,0.5;decelerate,0.5;addy,-150
 PlayerScoreListOffCommand=accelerate,0.5;addy,150
 
+[ScreenGameplaySyncMachine]
+Class=ScreenGameplaySyncMachine
+Fallback=ScreenGameplay
+PrevScreen=@ScreenGameplaySyncMachineNext()
+NextScreen=@ScreenGameplaySyncMachineNext()
+
+[ScreenSaveSyncMachine]
+Fallback=ScreenSaveSync
+Class=ScreenSaveSync
+NextScreen=ScreenOptionsService
+
 [PlayerScoreItem Percent]
 Fallback=ScoreDisplayPercentage Percent
 PercentP1X=0