diff --git a/.gitignore b/.gitignore
index ae28ebb..f0812b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 
 .buildpath
 
+.directory
+
 .project
 
 .settings
diff --git a/assets/sounds/creaking-door.mp3 b/assets/sounds/creaking-door.mp3
deleted file mode 100644
index ad5527c..0000000
Binary files a/assets/sounds/creaking-door.mp3 and /dev/null differ
diff --git a/assets/sounds/creaking-door.wav b/assets/sounds/creaking-door.wav
new file mode 100644
index 0000000..c91df61
Binary files /dev/null and b/assets/sounds/creaking-door.wav differ
diff --git a/assets/sounds/drink.mp3 b/assets/sounds/drink.mp3
index c19681e..c33501c 100644
Binary files a/assets/sounds/drink.mp3 and b/assets/sounds/drink.mp3 differ
diff --git a/assets/sounds/exit-door-close.mp3 b/assets/sounds/exit-door-close.mp3
index 2f2e6fb..ff5e91e 100644
Binary files a/assets/sounds/exit-door-close.mp3 and b/assets/sounds/exit-door-close.mp3 differ
diff --git a/assets/sounds/gate-fast-close.mp3 b/assets/sounds/gate-fast-close.mp3
deleted file mode 100644
index b64685a..0000000
Binary files a/assets/sounds/gate-fast-close.mp3 and /dev/null differ
diff --git a/assets/sounds/gate-fast-close.wav b/assets/sounds/gate-fast-close.wav
new file mode 100644
index 0000000..fed760b
Binary files /dev/null and b/assets/sounds/gate-fast-close.wav differ
diff --git a/assets/sounds/mirror.mp3 b/assets/sounds/mirror.mp3
index 55dc8d8..414e771 100644
Binary files a/assets/sounds/mirror.mp3 and b/assets/sounds/mirror.mp3 differ
diff --git a/assets/sounds/sounds.json b/assets/sounds/sounds.json
index 8295aeb..28dc934 100644
--- a/assets/sounds/sounds.json
+++ b/assets/sounds/sounds.json
@@ -5,12 +5,6 @@
 	   "duration":3526,
 	   "priority":30
 	},
-	"creaking-door":
-	{
-	   "type":"mp3",
-	   "duration":679,
-	   "priority":10
-	},
 	"death":
 	{
 	   "type":"mp3",
@@ -20,7 +14,7 @@
 	"drink":
 	{
 	   "type":"mp3",
-	   "duration":679,
+	   "duration":1044,
 	   "priority":20
 	},
 	"exit-door-open":
@@ -32,7 +26,7 @@
 	"exit-door-close":
 	{
 	   "type":"mp3",
-	   "duration":914,
+	   "duration":940,
 	   "priority":10
 	},
 	"fight-death":
@@ -41,12 +35,6 @@
 	   "duration":7706,
 	   "priority":30
 	},
-	"gate-fast-close":
-	{
-	   "type":"mp3",
-	   "duration":626,
-	   "priority":10
-	},
 	"glory":
 	{
 	   "type":"mp3",
@@ -68,7 +56,7 @@
 	"mirror":
 	{
 	   "type":"mp3",
-	   "duration":522,
+	   "duration":914,
 	   "priority":20
 	},
 	"small-life-potion":
@@ -80,7 +68,7 @@
 	"spikes":
 	{
 	   "type":"mp3",
-	   "duration":522,
+	   "duration":914,
 	   "priority":10
 	},
 	"success":
@@ -92,7 +80,7 @@
 	"success-suspense":
 	{
 	   "type":"mp3",
-	   "duration":7340,
+	   "duration":7418,
 	   "priority":100
 	},
 	"suspense":
@@ -119,12 +107,24 @@
 	   "duration":106,
 	   "priority":10
 	},
+	"creaking-door":
+	{
+	   "type":"wav",
+	   "duration":731,
+	   "priority":10
+	},
 	"gate-close":
 	{
 	   "type":"wav",
 	   "duration":97,
 	   "priority":15
 	},
+	"gate-fast-close":
+	{
+	   "type":"wav",
+	   "duration":679,
+	   "priority":10
+	},
 	"gate-end":
 	{
 	   "type":"wav",
diff --git a/assets/sounds/spikes.mp3 b/assets/sounds/spikes.mp3
index 34084cd..40bd588 100644
Binary files a/assets/sounds/spikes.mp3 and b/assets/sounds/spikes.mp3 differ
diff --git a/assets/sounds/success-suspense.mp3 b/assets/sounds/success-suspense.mp3
index cfb6817..6efb671 100644
Binary files a/assets/sounds/success-suspense.mp3 and b/assets/sounds/success-suspense.mp3 differ
diff --git a/manifest b/manifest
index 9c8faa3..dc02ebc 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 title=Prince of Persia
 subtitle=Roku remake of the Classic 8 bit Game
 major_version=0
-minor_version=12
-build_version=3444
+minor_version=13
+build_version=3453
 mm_icon_focus_hd=pkg:/images/icon_focus_hd.png
 mm_icon_side_hd=pkg:/images/icon_focus_hd.png
 mm_icon_focus_sd=pkg:/images/icon_side_hd.png
diff --git a/source/gameMain.brs b/source/gameMain.brs
index 4880d50..b728bc5 100644
--- a/source/gameMain.brs
+++ b/source/gameMain.brs
@@ -38,7 +38,13 @@ Sub Main()
     m.status = []
     'Check Roku model for performance alert
     if not IsOpenGL()
+        m.mainScreen = CreateObject("roScreen")
+        m.mainScreen.SetMessagePort(m.port)
         MessageDialog("Prince of Persia", "Warning: Your Roku device doesn't support accelerated graphics, this game will not perform well.")
+    else if IsRokuStick()
+        m.mainScreen = CreateObject("roScreen")
+        m.mainScreen.SetMessagePort(m.port)
+        MessageDialog("Prince of Persia", "Warning: Your Roku Stick device has limited memory, this game only works properly on the 4 rooms mode.")
     end if
     'Initialize Screen
     if isHD()
diff --git a/source/gameUtil.brs b/source/gameUtil.brs
index 2b7ced8..808ad95 100644
--- a/source/gameUtil.brs
+++ b/source/gameUtil.brs
@@ -406,8 +406,14 @@ End Function
 
 Function IsOpenGL() as Boolean
     di = CreateObject("roDeviceInfo")
-    model = Val(Left(di.GetModel(),1))
-    return (model = 3 or model = 4 or model = 6)
+    gp = di.GetGraphicsPlatform()
+    return (lcase(gp)="opengl")
+End Function
+
+Function IsRokuStick() as Boolean
+    di = CreateObject("roDeviceInfo")
+    model = di.GetModel()
+    return (model = "3600X")
 End Function
 
 'Nullable Boolean