diff --git a/Activity1.cs b/Activity1.cs
index 6646e5a..fc3c1f8 100644
--- a/Activity1.cs
+++ b/Activity1.cs
@@ -3,6 +3,7 @@ using Android.Content.PM;
 using Android.OS;
 using Android.Views;
 using Microsoft.Xna.Framework;
+using WindowsPhoneSpeedyBlupi;
 
 namespace WindowsPhoneSpeedyBlupi
 {
diff --git a/Decor.cs b/WindowsPhoneSpeedyBlupi/Decor.cs
similarity index 94%
rename from Decor.cs
rename to WindowsPhoneSpeedyBlupi/Decor.cs
index 3957465..1ff497a 100644
--- a/Decor.cs
+++ b/WindowsPhoneSpeedyBlupi/Decor.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Media;
-using WindowsPhoneSpeedyBlupi;
 using static System.Net.Mime.MediaTypeNames;
 
 
@@ -342,7 +341,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
         }
 
-        public Def.ButtonGlygh ButtonPressed { get; set; }
+        public Def.ButtonGlyph ButtonPressed { get; set; }
 
         private static void MoveObjectCopy(ref MoveObject dst, MoveObject src)
         {
@@ -395,7 +394,7 @@ namespace WindowsPhoneSpeedyBlupi
             m_lastKeyPress = 0;
             m_blupiMotorSound = 0;
             InitDecor();
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             pos.X = 90;
             pos.Y = 450;
             m_jauges[0] = new Jauge();
@@ -727,7 +726,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private bool BlitzActif(int celx, int cely)
         {
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             pos.X = celx * 64;
             pos.Y = cely * 64;
             int num = m_time % 100;
@@ -745,13 +744,13 @@ namespace WindowsPhoneSpeedyBlupi
         public void Build()
         {
             TinyPoint posDecor = DecorNextAction();
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             pos.X = posDecor.X * 2 / 3;
             pos.Y = posDecor.Y * 2 / 3;
             int num = 1;
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = m_drawBounds.Left;
-            TinyRect rect = default(TinyRect);
+            TinyRect rect = default;
             rect.Left = pos.X % 640;
             rect.Right = 640;
             for (int i = 0; i < 3; i++)
@@ -914,7 +913,7 @@ namespace WindowsPhoneSpeedyBlupi
                     double opacity = 1.0;
                     if (m_moveObject[num3].type == 58)
                     {
-                        opacity = (double)(20 - m_moveObject[num3].phase) * 0.3 / 20.0;
+                        opacity = (20 - m_moveObject[num3].phase) * 0.3 / 20.0;
                     }
                     m_pixmap.QuickIcon(m_moveObject[num3].channel, m_moveObject[num3].icon, tinyPoint, opacity, 0.0);
                     if (m_moveObject[num3].type == 30)
@@ -923,11 +922,11 @@ namespace WindowsPhoneSpeedyBlupi
                         {
                             int num4 = (m_time + Tables.table_drinkoffset[l]) % 50;
                             int rank = Tables.table_drinkeffect[num4 % 5];
-                            TinyPoint tinyPoint2 = default(TinyPoint);
+                            TinyPoint tinyPoint2 = default;
                             tinyPoint2.X = tinyPoint.X + 2;
                             tinyPoint2.Y = tinyPoint.Y - num4 * 3;
                             TinyPoint pos2 = tinyPoint2;
-                            double opacity2 = (50.0 - (double)num4) / 50.0;
+                            double opacity2 = (50.0 - num4) / 50.0;
                             m_pixmap.QuickIcon(10, rank, pos2, opacity2, 0.0);
                         }
                     }
@@ -948,7 +947,7 @@ namespace WindowsPhoneSpeedyBlupi
                         int num2 = m_decor[i, j].icon;
                         pos.X = tinyPoint.X;
                         pos.Y = tinyPoint.Y;
-                        if ((num2 >= 107 && num2 <= 109) || num2 == 157)
+                        if (num2 >= 107 && num2 <= 109 || num2 == 157)
                         {
                             pos.Y -= 7;
                         }
@@ -1042,7 +1041,7 @@ namespace WindowsPhoneSpeedyBlupi
                         }
                         if (num2 == 373)
                         {
-                            num2 = ((!m_blupiFocus) ? Tables.table_decor_piege2[(i * 13 + j * 7 + m_time / 2) % 4] : Tables.table_decor_piege1[(i * 13 + j * 7 + m_time / 4) % 16]);
+                            num2 = !m_blupiFocus ? Tables.table_decor_piege2[(i * 13 + j * 7 + m_time / 2) % 4] : Tables.table_decor_piege1[(i * 13 + j * 7 + m_time / 4) % 16];
                             m_pixmap.QuickIcon(1, num2, pos);
                         }
                         if (num2 == 404 || num2 == 410)
@@ -1138,7 +1137,7 @@ namespace WindowsPhoneSpeedyBlupi
             ByeByeDraw(posDecor);
             for (int num3 = 0; num3 < MAXMOVEOBJECT; num3++)
             {
-                if (m_moveObject[num3].type != 0 && m_moveObject[num3].posCurrent.X >= posDecor.X - 64 && m_moveObject[num3].posCurrent.Y >= posDecor.Y - 64 && m_moveObject[num3].posCurrent.X <= posDecor.X + m_drawBounds.Width && m_moveObject[num3].posCurrent.Y <= posDecor.Y + m_drawBounds.Height && ((m_moveObject[num3].type >= 8 && m_moveObject[num3].type <= 11) || (m_moveObject[num3].type >= 90 && m_moveObject[num3].type <= 95) || (m_moveObject[num3].type >= 98 && m_moveObject[num3].type <= 100) || m_moveObject[num3].type == 53))
+                if (m_moveObject[num3].type != 0 && m_moveObject[num3].posCurrent.X >= posDecor.X - 64 && m_moveObject[num3].posCurrent.Y >= posDecor.Y - 64 && m_moveObject[num3].posCurrent.X <= posDecor.X + m_drawBounds.Width && m_moveObject[num3].posCurrent.Y <= posDecor.Y + m_drawBounds.Height && (m_moveObject[num3].type >= 8 && m_moveObject[num3].type <= 11 || m_moveObject[num3].type >= 90 && m_moveObject[num3].type <= 95 || m_moveObject[num3].type >= 98 && m_moveObject[num3].type <= 100 || m_moveObject[num3].type == 53))
                 {
                     tinyPoint.X = m_drawBounds.Left + m_moveObject[num3].posCurrent.X - posDecor.X;
                     tinyPoint.Y = m_drawBounds.Top + m_moveObject[num3].posCurrent.Y - posDecor.Y;
@@ -1158,7 +1157,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void DrawInfo()
         {
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             pos.X = 210;
             pos.Y = 417;
             for (int i = 0; i < m_nbVies; i++)
@@ -1207,9 +1206,9 @@ namespace WindowsPhoneSpeedyBlupi
                 pos.Y = 418;
                 m_pixmap.HudIcon(10, 229, pos);
             }
-            if ((m_mission != 1 && m_mission % 10 != 0) || m_bPrivate)
+            if (m_mission != 1 && m_mission % 10 != 0 || m_bPrivate)
             {
-                TinyRect tinyRect = default(TinyRect);
+                TinyRect tinyRect = default;
                 tinyRect.Left = 410 + m_pixmap.Origin.X;
                 tinyRect.Right = 510 + m_pixmap.Origin.X;
                 tinyRect.Top = 445;
@@ -1264,7 +1263,7 @@ namespace WindowsPhoneSpeedyBlupi
                     if (!string.IsNullOrEmpty(text))
                     {
                         TinyRect drawBounds = m_pixmap.DrawBounds;
-                        TinyRect tinyRect2 = default(TinyRect);
+                        TinyRect tinyRect2 = default;
                         tinyRect2.Left = 0;
                         tinyRect2.Right = drawBounds.Width;
                         tinyRect2.Top = 0;
@@ -1329,7 +1328,7 @@ namespace WindowsPhoneSpeedyBlupi
                 {
                     posDecor.X += 3 * Tables.table_decor_action[i + 2 + m_decorPhase * 2];
                     posDecor.Y += 3 * Tables.table_decor_action[i + 2 + m_decorPhase * 2 + 1];
-                    int num = ((m_dimDecor.X != 0) ? (6400 - m_drawBounds.Width) : 0);
+                    int num = m_dimDecor.X != 0 ? 6400 - m_drawBounds.Width : 0;
                     if (posDecor.X < 0)
                     {
                         posDecor.X = 0;
@@ -1338,7 +1337,7 @@ namespace WindowsPhoneSpeedyBlupi
                     {
                         posDecor.X = num;
                     }
-                    num = ((m_dimDecor.Y != 0) ? (6400 - m_drawBounds.Height) : 0);
+                    num = m_dimDecor.Y != 0 ? 6400 - m_drawBounds.Height : 0;
                     if (posDecor.Y < 0)
                     {
                         posDecor.Y = 0;
@@ -1387,7 +1386,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private int SoundEnviron(int sound, int obstacle)
         {
-            if ((obstacle >= 32 && obstacle <= 34) || (obstacle >= 41 && obstacle <= 47) || (obstacle >= 139 && obstacle <= 143))
+            if (obstacle >= 32 && obstacle <= 34 || obstacle >= 41 && obstacle <= 47 || obstacle >= 139 && obstacle <= 143)
             {
                 switch (sound)
                 {
@@ -1397,7 +1396,7 @@ namespace WindowsPhoneSpeedyBlupi
                         return 78;
                 }
             }
-            if ((obstacle >= 1 && obstacle <= 28) || (obstacle >= 78 && obstacle <= 90) || (obstacle >= 250 && obstacle <= 260) || (obstacle >= 311 && obstacle <= 316) || (obstacle >= 324 && obstacle <= 329))
+            if (obstacle >= 1 && obstacle <= 28 || obstacle >= 78 && obstacle <= 90 || obstacle >= 250 && obstacle <= 260 || obstacle >= 311 && obstacle <= 316 || obstacle >= 324 && obstacle <= 329)
             {
                 switch (sound)
                 {
@@ -1407,7 +1406,7 @@ namespace WindowsPhoneSpeedyBlupi
                         return 80;
                 }
             }
-            if ((obstacle >= 284 && obstacle <= 303) || obstacle == 338)
+            if (obstacle >= 284 && obstacle <= 303 || obstacle == 338)
             {
                 switch (sound)
                 {
@@ -1462,7 +1461,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void PlaySound(int sound, TinyPoint pos)
         {
-            if (!m_blupiHide || (sound != 1 && sound != 2 && sound != 3 && sound != 4 && sound != 5 && sound != 6 && sound != 7 && sound != 20 && sound != 21 && sound != 22 && sound != 23 && sound != 24 && sound != 25 && sound != 27 && sound != 32 && sound != 34 && sound != 35 && sound != 36 && sound != 37 && sound != 38 && sound != 39 && sound != 40 && sound != 46 && sound != 47 && sound != 48 && sound != 49 && sound != 64 && sound != 65 && sound != 78 && sound != 79 && sound != 80 && sound != 81 && sound != 82 && sound != 83 && sound != 84 && sound != 85 && sound != 86 && sound != 87 && sound != 88 && sound != 89 && sound != 90 && sound != 91))
+            if (!m_blupiHide || sound != 1 && sound != 2 && sound != 3 && sound != 4 && sound != 5 && sound != 6 && sound != 7 && sound != 20 && sound != 21 && sound != 22 && sound != 23 && sound != 24 && sound != 25 && sound != 27 && sound != 32 && sound != 34 && sound != 35 && sound != 36 && sound != 37 && sound != 38 && sound != 39 && sound != 40 && sound != 46 && sound != 47 && sound != 48 && sound != 49 && sound != 64 && sound != 65 && sound != 78 && sound != 79 && sound != 80 && sound != 81 && sound != 82 && sound != 83 && sound != 84 && sound != 85 && sound != 86 && sound != 87 && sound != 88 && sound != 89 && sound != 90 && sound != 91)
             {
                 pos.X -= m_posDecor.X;
                 pos.Y -= m_posDecor.Y;
@@ -1493,13 +1492,13 @@ namespace WindowsPhoneSpeedyBlupi
             int channel2 = 0;
             if (m_blupiHelico)
             {
-                num = (m_blupiMotorHigh ? 16 : 18);
+                num = m_blupiMotorHigh ? 16 : 18;
                 channel = 15;
                 channel2 = 17;
             }
             else if (m_blupiJeep || m_blupiOver || m_blupiTank)
             {
-                num = (m_blupiMotorHigh ? 29 : 31);
+                num = m_blupiMotorHigh ? 29 : 31;
                 channel = 28;
                 channel2 = 30;
             }
@@ -1598,27 +1597,27 @@ namespace WindowsPhoneSpeedyBlupi
             gameData.SetDoors(m_doors);
         }
 
-        public static string GetCheatTinyText(Def.ButtonGlygh glyph)
+        public static string GetCheatTinyText(Def.ButtonGlyph glyph)
         {
             switch (glyph)
             {
-                case Def.ButtonGlygh.Cheat1:
+                case Def.ButtonGlyph.Cheat1:
                     return "D";
-                case Def.ButtonGlygh.Cheat2:
+                case Def.ButtonGlyph.Cheat2:
                     return "B";
-                case Def.ButtonGlygh.Cheat3:
+                case Def.ButtonGlyph.Cheat3:
                     return "S";
-                case Def.ButtonGlygh.Cheat4:
+                case Def.ButtonGlyph.Cheat4:
                     return "E";
-                case Def.ButtonGlygh.Cheat5:
+                case Def.ButtonGlyph.Cheat5:
                     return "R";
-                case Def.ButtonGlygh.Cheat6:
+                case Def.ButtonGlyph.Cheat6:
                     return "T";
-                case Def.ButtonGlygh.Cheat7:
+                case Def.ButtonGlyph.Cheat7:
                     return "C";
-                case Def.ButtonGlygh.Cheat8:
+                case Def.ButtonGlyph.Cheat8:
                     return "T";
-                case Def.ButtonGlygh.Cheat9:
+                case Def.ButtonGlyph.Cheat9:
                     return "G";
                 default:
                     return "";
@@ -2066,7 +2065,7 @@ namespace WindowsPhoneSpeedyBlupi
                 {
                     num4 = -1;
                 }
-                int num5 = ((num4 >= 0 || num3 != 0) ? ((num4 < 0 && num3 != 0) ? 45 : ((num4 == 0 && num3 != 0) ? 90 : ((num4 > 0 && num3 != 0) ? 135 : ((num4 > 0 && num3 == 0) ? 180 : 0)))) : 0);
+                int num5 = num4 >= 0 || num3 != 0 ? num4 < 0 && num3 != 0 ? 45 : num4 == 0 && num3 != 0 ? 90 : num4 > 0 && num3 != 0 ? 135 : num4 > 0 && num3 == 0 ? 180 : 0 : 0;
                 num5 += 15;
                 if (num2 == 20)
                 {
@@ -2081,7 +2080,7 @@ namespace WindowsPhoneSpeedyBlupi
                 {
                     m_blupiRealRotation = 90 - m_blupiLogicRotation;
                 }
-                m_blupiRealRotation += (int)(Math.Sin((double)m_time / 6.0) * 20.0);
+                m_blupiRealRotation += (int)(Math.Sin(m_time / 6.0) * 20.0);
             }
             if (m_blupiSurf)
             {
@@ -2099,7 +2098,7 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 m_blupiLogicRotation = Misc.Approch(m_blupiLogicRotation, 0, 10);
                 m_blupiRealRotation = m_blupiLogicRotation;
-                m_blupiRealRotation += (int)(Math.Sin((double)m_time / 10.0) * 10.0);
+                m_blupiRealRotation += (int)(Math.Sin(m_time / 10.0) * 10.0);
             }
             if (m_blupiSuspend)
             {
@@ -2152,7 +2151,7 @@ namespace WindowsPhoneSpeedyBlupi
                 MoveObjectTiplouf(m_blupiPos);
             }
             int num6 = m_blupiPhase;
-            if (!m_blupiHelico && ((m_blupiSpeedX > 0.1 && m_blupiSpeedX < 0.75) || (m_blupiSpeedX < -0.1 && m_blupiSpeedX > -0.75)))
+            if (!m_blupiHelico && (m_blupiSpeedX > 0.1 && m_blupiSpeedX < 0.75 || m_blupiSpeedX < -0.1 && m_blupiSpeedX > -0.75))
             {
                 num6 /= 2;
             }
@@ -2160,12 +2159,12 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 if (num2 == Tables.table_blupi[i])
                 {
-                    int num7 = ((Tables.table_blupi[i + 2] == 0 || num6 <= Tables.table_blupi[i + 2]) ? (num6 % Tables.table_blupi[i + 1]) : Tables.table_blupi[i + 2]);
+                    int num7 = Tables.table_blupi[i + 2] == 0 || num6 <= Tables.table_blupi[i + 2] ? num6 % Tables.table_blupi[i + 1] : Tables.table_blupi[i + 2];
                     num = Tables.table_blupi[i + 3 + num7];
                     break;
                 }
             }
-            if (num2 == 11 || num2 == 75 || num2 == 76 || num2 == 54 || (num2 == 57 && num < 266))
+            if (num2 == 11 || num2 == 75 || num2 == 76 || num2 == 54 || num2 == 57 && num < 266)
             {
                 m_blupiChannel = 10;
             }
@@ -2229,7 +2228,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private TinyRect BlupiRect(TinyPoint pos)
         {
-            TinyRect result = default(TinyRect);
+            TinyRect result = default;
             if (m_blupiNage || m_blupiSurf)
             {
                 result.Left = pos.X + 12;
@@ -2383,8 +2382,8 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void BlupiStep()
         {
-            TinyPoint celSwitch = default(TinyPoint);
-            TinyPoint celBridge = default(TinyPoint);
+            TinyPoint celSwitch = default;
+            TinyPoint celBridge = default;
             BlupiAdjust();
             m_blupiLastPos = m_blupiPos;
             TinyPoint end = m_blupiPos;
@@ -2403,7 +2402,7 @@ namespace WindowsPhoneSpeedyBlupi
                 PlaySound(8, m_blupiPos);
                 return;
             }
-            TinyRect rect = default(TinyRect);
+            TinyRect rect = default;
             if (m_blupiVector.X != 0 || m_blupiVector.Y != 0)
             {
                 rect = BlupiRect(m_blupiPos);
@@ -2536,11 +2535,11 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 if (((uint)m_keyPress & (true ? 1u : 0u)) != 0 && m_blupiFocus)
                 {
-                    m_blupiVitesseY = (m_blupiPower ? (-25) : (-19));
+                    m_blupiVitesseY = m_blupiPower ? -25 : -19;
                 }
                 else
                 {
-                    m_blupiVitesseY = (m_blupiPower ? (-16) : (-10));
+                    m_blupiVitesseY = m_blupiPower ? -16 : -10;
                 }
                 m_blupiAir = true;
                 flag = true;
@@ -2560,18 +2559,18 @@ namespace WindowsPhoneSpeedyBlupi
                     if (m_blupiSkate)
                     {
                         PlaySound(1, end);
-                        m_blupiVitesseY = (m_blupiPower ? (-17) : (-13));
+                        m_blupiVitesseY = m_blupiPower ? -17 : -13;
                     }
                     else
                     {
                         PlaySound(1, end);
                         if (IsNormalJump(end))
                         {
-                            m_blupiVitesseY = (m_blupiPower ? (-26) : (-16));
+                            m_blupiVitesseY = m_blupiPower ? -26 : -16;
                         }
                         else
                         {
-                            m_blupiVitesseY = (m_blupiPower ? (-16) : (-12));
+                            m_blupiVitesseY = m_blupiPower ? -16 : -12;
                         }
                     }
                     m_blupiAir = true;
@@ -2954,7 +2953,7 @@ namespace WindowsPhoneSpeedyBlupi
             int num3;
             if (m_blupiSpeedX < 0.0 && m_blupiFocus)
             {
-                if (m_blupiDir == 2 && m_blupiAction != 3 && m_blupiAction != 59 && m_blupiAction != 7 && m_blupiAction != 6 && m_blupiAction != 29 && ((!m_blupiJeep && !m_blupiTank && !m_blupiSkate) || Math.Abs(m_blupiVitesseX) <= 8.0))
+                if (m_blupiDir == 2 && m_blupiAction != 3 && m_blupiAction != 59 && m_blupiAction != 7 && m_blupiAction != 6 && m_blupiAction != 29 && (!m_blupiJeep && !m_blupiTank && !m_blupiSkate || Math.Abs(m_blupiVitesseX) <= 8.0))
                 {
                     if (m_blupiAir)
                     {
@@ -3004,7 +3003,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (m_blupiSpeedX > 0.0 && m_blupiFocus)
             {
-                if (m_blupiDir == 1 && m_blupiAction != 3 && m_blupiAction != 59 && m_blupiAction != 7 && m_blupiAction != 6 && m_blupiAction != 29 && ((!m_blupiJeep && !m_blupiTank && !m_blupiSkate) || Math.Abs(m_blupiVitesseX) <= 8.0))
+                if (m_blupiDir == 1 && m_blupiAction != 3 && m_blupiAction != 59 && m_blupiAction != 7 && m_blupiAction != 6 && m_blupiAction != 29 && (!m_blupiJeep && !m_blupiTank && !m_blupiSkate || Math.Abs(m_blupiVitesseX) <= 8.0))
                 {
                     if (m_blupiAir)
                     {
@@ -3358,7 +3357,7 @@ namespace WindowsPhoneSpeedyBlupi
                     if (m_blupiSpeedX <= -1.0)
                     {
                         int num4 = (int)(m_blupiSpeedX * 12.0);
-                        if (m_blupiVitesseX > (double)num4)
+                        if (m_blupiVitesseX > num4)
                         {
                             m_blupiVitesseX -= 0.5;
                         }
@@ -3372,7 +3371,7 @@ namespace WindowsPhoneSpeedyBlupi
                     else if (m_blupiSpeedX >= 1.0)
                     {
                         int num5 = (int)(m_blupiSpeedX * 12.0);
-                        if (m_blupiVitesseX < (double)num5)
+                        if (m_blupiVitesseX < num5)
                         {
                             m_blupiVitesseX += 0.5;
                         }
@@ -3409,7 +3408,7 @@ namespace WindowsPhoneSpeedyBlupi
                     if (m_blupiSpeedX <= -1.0)
                     {
                         int num6 = (int)(m_blupiSpeedX * 16.0);
-                        if (m_blupiVitesseX > (double)num6)
+                        if (m_blupiVitesseX > num6)
                         {
                             m_blupiVitesseX -= 1.0;
                         }
@@ -3423,7 +3422,7 @@ namespace WindowsPhoneSpeedyBlupi
                     else if (m_blupiSpeedX >= 1.0)
                     {
                         int num7 = (int)(m_blupiSpeedX * 16.0);
-                        if (m_blupiVitesseX < (double)num7)
+                        if (m_blupiVitesseX < num7)
                         {
                             m_blupiVitesseX += 1.0;
                         }
@@ -3456,9 +3455,9 @@ namespace WindowsPhoneSpeedyBlupi
                     end.X += (int)m_blupiVitesseX;
                 }
                 MoveObjectPollution();
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     rect.Left = m_blupiPos.X + 20;
                     rect.Right = m_blupiPos.X + 22;
                     rect.Top = m_blupiPos.Y + 60 - 2;
@@ -3539,7 +3538,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (m_blupiSpeedX < 0.0 && flag2)
                 {
                     int num8 = (int)(m_blupiSpeedX * 12.0);
-                    if (m_blupiVitesseX > (double)num8)
+                    if (m_blupiVitesseX > num8)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -3553,7 +3552,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0 && flag2)
                 {
                     int num9 = (int)(m_blupiSpeedX * 12.0);
-                    if (m_blupiVitesseX < (double)num9)
+                    if (m_blupiVitesseX < num9)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -3577,9 +3576,9 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 end.X += (int)m_blupiVitesseX;
                 MoveObjectPollution();
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     rect.Left = m_blupiPos.X + 20;
                     rect.Right = m_blupiPos.X + 22;
                     rect.Top = m_blupiPos.Y + 60 - 2;
@@ -3630,7 +3629,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (m_blupiSpeedX < 0.0)
                 {
                     int num10 = (int)(m_blupiSpeedX * 10.0);
-                    if (m_blupiVitesseX > (double)num10)
+                    if (m_blupiVitesseX > num10)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -3644,7 +3643,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0)
                 {
                     int num11 = (int)(m_blupiSpeedX * 10.0);
-                    if (m_blupiVitesseX < (double)num11)
+                    if (m_blupiVitesseX < num11)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -3690,11 +3689,11 @@ namespace WindowsPhoneSpeedyBlupi
                     m_blupiVitesseY = 0.0;
                 }
                 end.Y += (int)m_blupiVitesseY;
-                num2 = ((!flag2) ? 4 : 7);
-                num2 = (int)((double)num2 * m_blupiSpeedX);
+                num2 = !flag2 ? 4 : 7;
+                num2 = (int)(num2 * m_blupiSpeedX);
                 if (m_blupiSpeedX < 0.0)
                 {
-                    if (m_blupiVitesseX > (double)num2)
+                    if (m_blupiVitesseX > num2)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -3707,7 +3706,7 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 else if (m_blupiSpeedX > 0.0)
                 {
-                    if (m_blupiVitesseX < (double)num2)
+                    if (m_blupiVitesseX < num2)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -3794,7 +3793,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (flag5 && !flag6)
                 {
                     int num12 = -20;
-                    if (m_blupiVitesseX > (double)num12)
+                    if (m_blupiVitesseX > num12)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -3802,7 +3801,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (!flag5 && flag6)
                 {
                     int num13 = 20;
-                    if (m_blupiVitesseX < (double)num13)
+                    if (m_blupiVitesseX < num13)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -3810,7 +3809,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX < 0.0)
                 {
                     int num14 = (int)(m_blupiSpeedX * 20.0);
-                    if (m_blupiVitesseX > (double)num14)
+                    if (m_blupiVitesseX > num14)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -3818,7 +3817,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0)
                 {
                     int num15 = (int)(m_blupiSpeedX * 20.0);
-                    if (m_blupiVitesseX < (double)num15)
+                    if (m_blupiVitesseX < num15)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -3861,9 +3860,9 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 m_blupiOffsetY = Math.Abs(m_blupiRealRotation / 2);
                 MoveObjectPollution();
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     celSwitch.X = m_blupiPos.X;
                     celSwitch.Y = m_blupiPos.Y - BLUPIFLOOR;
                     ObjectStart(celSwitch, 19, 0);
@@ -3955,7 +3954,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (m_blupiSpeedX < 0.0)
                 {
                     int num16 = (int)(m_blupiSpeedX * 12.0);
-                    if (m_blupiVitesseX > (double)num16)
+                    if (m_blupiVitesseX > num16)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -3963,7 +3962,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0)
                 {
                     int num17 = (int)(m_blupiSpeedX * 12.0);
-                    if (m_blupiVitesseX < (double)num17)
+                    if (m_blupiVitesseX < num17)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -3993,9 +3992,9 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 end.X += (int)m_blupiVitesseX;
                 MoveObjectPollution();
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && m_blupiTransport == -1)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && m_blupiTransport == -1)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     celSwitch.X = m_blupiPos.X;
                     celSwitch.Y = m_blupiPos.Y;
                     ObjectStart(celSwitch, 28, 0);
@@ -4018,7 +4017,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (m_blupiSpeedX < 0.0)
                 {
                     int num18 = (int)(m_blupiSpeedX * 15.0);
-                    if (m_blupiVitesseX > (double)num18)
+                    if (m_blupiVitesseX > num18)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -4026,7 +4025,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0)
                 {
                     int num19 = (int)(m_blupiSpeedX * 15.0);
-                    if (m_blupiVitesseX < (double)num19)
+                    if (m_blupiVitesseX < num19)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -4055,9 +4054,9 @@ namespace WindowsPhoneSpeedyBlupi
                     m_blupiVitesseX = 0.0;
                 }
                 end.X += (int)m_blupiVitesseX;
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && !flag2 && !m_blupiAir && m_blupiTransport == -1 && m_blupiVitesseX < 8.0)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && !flag2 && !m_blupiAir && m_blupiTransport == -1 && m_blupiVitesseX < 8.0)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     m_blupiSkate = false;
                     m_blupiAction = 43;
                     m_blupiPhase = 0;
@@ -4117,12 +4116,12 @@ namespace WindowsPhoneSpeedyBlupi
                     }
                     else
                     {
-                        num2 = ((m_blupiAction == 1) ? (-1) : 0);
-                        if (m_blupiVitesseY > (double)num2)
+                        num2 = m_blupiAction == 1 ? -1 : 0;
+                        if (m_blupiVitesseY > num2)
                         {
                             m_blupiVitesseY -= 1.0;
                         }
-                        if (m_blupiVitesseY < (double)num2)
+                        if (m_blupiVitesseY < num2)
                         {
                             m_blupiVitesseY += 1.0;
                         }
@@ -4132,7 +4131,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (m_blupiSpeedX < 0.0)
                 {
                     int num20 = (int)(m_blupiSpeedX * 8.0);
-                    if (m_blupiVitesseX > (double)num20)
+                    if (m_blupiVitesseX > num20)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -4140,7 +4139,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0)
                 {
                     int num21 = (int)(m_blupiSpeedX * 8.0);
-                    if (m_blupiVitesseX < (double)num21)
+                    if (m_blupiVitesseX < num21)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -4165,7 +4164,7 @@ namespace WindowsPhoneSpeedyBlupi
                     }
                 }
                 icon = Tables.table_vitesse_nage[m_blupiPhase % 14 / 2];
-                end.X += (int)(m_blupiVitesseX * (double)icon / 7.0);
+                end.X += (int)(m_blupiVitesseX * icon / 7.0);
                 if (m_time % 70 == 0 || m_time % 70 == 28)
                 {
                     MoveObjectBlup(end);
@@ -4251,7 +4250,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if (m_blupiSpeedX < 0.0)
                 {
                     int num22 = (int)(m_blupiSpeedX * 8.0);
-                    if (m_blupiVitesseX > (double)num22)
+                    if (m_blupiVitesseX > num22)
                     {
                         m_blupiVitesseX -= 1.0;
                     }
@@ -4259,7 +4258,7 @@ namespace WindowsPhoneSpeedyBlupi
                 else if (m_blupiSpeedX > 0.0)
                 {
                     int num23 = (int)(m_blupiSpeedX * 8.0);
-                    if (m_blupiVitesseX < (double)num23)
+                    if (m_blupiVitesseX < num23)
                     {
                         m_blupiVitesseX += 1.0;
                     }
@@ -4284,9 +4283,9 @@ namespace WindowsPhoneSpeedyBlupi
                     }
                 }
                 icon = Tables.table_vitesse_surf[m_blupiPhase % 12 / 2];
-                end.X += (int)(m_blupiVitesseX * (double)icon / 10.0);
+                end.X += (int)(m_blupiVitesseX * icon / 10.0);
             }
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             if (m_blupiSuspend && m_blupiFocus)
             {
                 if (m_blupiSpeedX < 0.0 && m_blupiAction == 2)
@@ -4310,10 +4309,10 @@ namespace WindowsPhoneSpeedyBlupi
                         m_blupiSuspend = false;
                         m_blupiAction = 1;
                         m_blupiPhase = 0;
-                        end = (m_blupiPos = tinyPoint);
+                        end = m_blupiPos = tinyPoint;
                     }
                 }
-                if ((m_blupiSpeedY > 0.0 && m_blupiPhase > 5) || icon == 0)
+                if (m_blupiSpeedY > 0.0 && m_blupiPhase > 5 || icon == 0)
                 {
                     m_blupiSuspend = false;
                     m_blupiAir = true;
@@ -4346,11 +4345,11 @@ namespace WindowsPhoneSpeedyBlupi
                     PlaySound(35, end);
                 }
             }
-            if (ButtonPressed == Def.ButtonGlygh.PlayAction && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiTank && !m_blupiJeep && !m_blupiSkate && !flag2 && m_blupiTransport == -1 && m_blupiFocus)
+            if (ButtonPressed == Def.ButtonGlyph.PlayAction && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiTank && !m_blupiJeep && !m_blupiSkate && !flag2 && m_blupiTransport == -1 && m_blupiFocus)
             {
                 if (m_blupiDynamite > 0)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     rect.Left = end.X + 18;
                     rect.Right = end.X + 20;
                     rect.Top = end.Y + 60 - 2;
@@ -4372,7 +4371,7 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 else if (m_blupiPerso > 0)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     icon = MoveObjectDetect(end, out bNear);
                     if (icon == -1 || m_moveObject[icon].type != 200)
                     {
@@ -5031,7 +5030,7 @@ namespace WindowsPhoneSpeedyBlupi
                 }
             }
             int num26 = MoveObjectDetect(m_blupiPos, out bNear);
-            TinyPoint tinyPoint2 = default(TinyPoint);
+            TinyPoint tinyPoint2 = default;
             if (m_blupiAction != 11 && m_blupiAction != 75 && m_blupiAction != 76 && m_blupiAction != 77 && m_blupiAction != 78 && m_blupiAction != 79 && m_blupiAction != 80 && m_blupiAction != 81)
             {
                 if (IsLave(m_blupiPos) && !m_blupiShield && !m_blupiHide && !m_bSuperBlupi)
@@ -5063,9 +5062,9 @@ namespace WindowsPhoneSpeedyBlupi
                     m_blupiRestart = true;
                     m_blupiAir = true;
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && (num26 == -1 || !bNear) && IsSwitch(m_blupiPos, ref celSwitch) && !m_blupiOver && !m_blupiBalloon && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiShield && !m_blupiHide && !m_bSuperBlupi && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && (num26 == -1 || !bNear) && IsSwitch(m_blupiPos, ref celSwitch) && !m_blupiOver && !m_blupiBalloon && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiShield && !m_blupiHide && !m_bSuperBlupi && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     ActiveSwitch(m_decor[celSwitch.X, celSwitch.Y].icon == 385, celSwitch);
                     m_blupiAction = 82;
                     m_blupiPhase = 0;
@@ -5144,7 +5143,7 @@ namespace WindowsPhoneSpeedyBlupi
                     ObjectStart(celBridge, 52, 0);
                 }
                 int num = IsDoor(m_blupiPos, ref celBridge);
-                if (num != -1 && (m_blupiCle & (1 << num - 334)) != 0)
+                if (num != -1 && (m_blupiCle & 1 << num - 334) != 0)
                 {
                     OpenDoor(celBridge);
                     m_blupiCle &= ~(1 << num - 334);
@@ -5173,9 +5172,9 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (icon != -1 && bNear)
             {
-                if (m_moveObject[icon].type == 13 && (ButtonPressed == Def.ButtonGlygh.PlayAction || IsFloatingObject(icon)) && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
+                if (m_moveObject[icon].type == 13 && (ButtonPressed == Def.ButtonGlyph.PlayAction || IsFloatingObject(icon)) && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     m_scrollAdd.X = 0;
                     m_scrollAdd.Y = 0;
@@ -5190,9 +5189,9 @@ namespace WindowsPhoneSpeedyBlupi
                         m_jauges[1].SetHide(true);
                     }
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 46 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 46 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     m_scrollAdd.X = 0;
                     m_scrollAdd.Y = 0;
@@ -5206,9 +5205,9 @@ namespace WindowsPhoneSpeedyBlupi
                         m_jauges[1].SetHide(true);
                     }
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 19 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 19 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     m_scrollAdd.X = 0;
                     m_scrollAdd.Y = 0;
@@ -5224,9 +5223,9 @@ namespace WindowsPhoneSpeedyBlupi
                         m_jauges[1].SetHide(true);
                     }
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 28 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 28 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     m_scrollAdd.X = 0;
                     m_scrollAdd.Y = 0;
@@ -5256,9 +5255,9 @@ namespace WindowsPhoneSpeedyBlupi
                         m_blupiBullet = 10;
                     }
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 24 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 24 && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     m_scrollAdd.X = 0;
                     m_scrollAdd.Y = 0;
                     m_blupiAction = 42;
@@ -5449,7 +5448,7 @@ namespace WindowsPhoneSpeedyBlupi
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X;
                     celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y;
-                    TinyPoint end2 = default(TinyPoint);
+                    TinyPoint end2 = default;
                     end2.X = 430;
                     end2.Y = 430;
                     VoyageInit(m_pixmap.HotSpotToHud(celSwitch), end2, 6, 10);
@@ -5463,7 +5462,7 @@ namespace WindowsPhoneSpeedyBlupi
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X;
                     celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y;
-                    TinyPoint end3 = default(TinyPoint);
+                    TinyPoint end3 = default;
                     end3.X = 520;
                     end3.Y = 418;
                     VoyageInit(m_pixmap.HotSpotToHud(celSwitch), end3, 215, 10);
@@ -5477,7 +5476,7 @@ namespace WindowsPhoneSpeedyBlupi
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X;
                     celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y;
-                    TinyPoint end4 = default(TinyPoint);
+                    TinyPoint end4 = default;
                     end4.X = 530;
                     end4.Y = 418;
                     VoyageInit(m_pixmap.HotSpotToHud(celSwitch), end4, 222, 10);
@@ -5491,7 +5490,7 @@ namespace WindowsPhoneSpeedyBlupi
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X;
                     celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y;
-                    TinyPoint end5 = default(TinyPoint);
+                    TinyPoint end5 = default;
                     end5.X = 540;
                     end5.Y = 418;
                     VoyageInit(m_pixmap.HotSpotToHud(celSwitch), end5, 229, 10);
@@ -5518,9 +5517,9 @@ namespace WindowsPhoneSpeedyBlupi
                     m_blupiPosMagic = m_blupiPos;
                     m_jauges[1].SetHide(false);
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 26 && !m_blupiShield && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 26 && !m_blupiShield && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     m_sucettePos = m_moveObject[icon].posCurrent;
                     m_sucetteType = m_moveObject[icon].type;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
@@ -5544,9 +5543,9 @@ namespace WindowsPhoneSpeedyBlupi
                     ObjectStart(m_blupiPos, 41, 10);
                     ObjectStart(m_blupiPos, 41, -10);
                 }
-                if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_moveObject[icon].type == 30 && !m_blupiShield && !m_blupiCloud && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus)
+                if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_moveObject[icon].type == 30 && !m_blupiShield && !m_blupiCloud && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiSkate && m_blupiFocus)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     m_sucettePos = m_moveObject[icon].posCurrent;
                     m_sucetteType = m_moveObject[icon].type;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
@@ -5579,9 +5578,9 @@ namespace WindowsPhoneSpeedyBlupi
                 {
                     if (m_moveObject[icon].type == 200)
                     {
-                        if (m_blupiPerso < 5 && ButtonPressed == Def.ButtonGlygh.PlayAction)
+                        if (m_blupiPerso < 5 && ButtonPressed == Def.ButtonGlyph.PlayAction)
                         {
-                            ButtonPressed = Def.ButtonGlygh.None;
+                            ButtonPressed = Def.ButtonGlyph.None;
                             ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                             celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X;
                             celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y;
@@ -5603,9 +5602,9 @@ namespace WindowsPhoneSpeedyBlupi
                         m_decorPhase = 0;
                     }
                 }
-                if (m_moveObject[icon].type == 55 && m_blupiFocus && m_blupiDynamite == 0 && (m_voyageIcon != 252 || m_voyageChannel != 10) && ButtonPressed == Def.ButtonGlygh.PlayAction)
+                if (m_moveObject[icon].type == 55 && m_blupiFocus && m_blupiDynamite == 0 && (m_voyageIcon != 252 || m_voyageChannel != 10) && ButtonPressed == Def.ButtonGlyph.PlayAction)
                 {
-                    ButtonPressed = Def.ButtonGlygh.None;
+                    ButtonPressed = Def.ButtonGlyph.None;
                     ObjectDelete(m_moveObject[icon].posCurrent, m_moveObject[icon].type);
                     celSwitch.X = m_moveObject[icon].posCurrent.X - m_posDecor.X;
                     celSwitch.Y = m_moveObject[icon].posCurrent.Y - m_posDecor.Y;
@@ -5833,7 +5832,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (m_blupiAction == 74 && m_blupiPhase == 128)
             {
-                TinyPoint newpos = default(TinyPoint);
+                TinyPoint newpos = default;
                 if (SearchTeleporte(m_blupiPos, ref newpos))
                 {
                     m_blupiPos = newpos;
@@ -5849,13 +5848,13 @@ namespace WindowsPhoneSpeedyBlupi
                 m_blupiPhase = 0;
                 m_blupiFocus = true;
             }
-            if (ButtonPressed == Def.ButtonGlygh.PlayAction && m_blupiAction == 1)
+            if (ButtonPressed == Def.ButtonGlyph.PlayAction && m_blupiAction == 1)
             {
                 m_blupiAction = 84;
                 m_blupiPhase = 0;
                 PlaySound(27, m_blupiPos);
             }
-            if ((m_blupiAction == 11 && m_blupiPhase == 70) || (m_blupiAction == 75 && m_blupiPhase == 100) || (m_blupiAction == 76 && m_blupiPhase == 70) || (m_blupiAction == 77 && m_blupiPhase == 110) || (m_blupiAction == 78 && m_blupiPhase == 90) || (m_blupiAction == 79 && m_blupiPhase == 90) || (m_blupiAction == 80 && m_blupiPhase == 90) || (m_blupiAction == 81 && m_blupiPhase == 90) || (m_blupiAction == 24 && m_blupiPhase == 90) || (m_blupiAction == 54 && m_blupiPhase == 100) || (m_blupiAction == 57 && m_blupiPhase == 90))
+            if (m_blupiAction == 11 && m_blupiPhase == 70 || m_blupiAction == 75 && m_blupiPhase == 100 || m_blupiAction == 76 && m_blupiPhase == 70 || m_blupiAction == 77 && m_blupiPhase == 110 || m_blupiAction == 78 && m_blupiPhase == 90 || m_blupiAction == 79 && m_blupiPhase == 90 || m_blupiAction == 80 && m_blupiPhase == 90 || m_blupiAction == 81 && m_blupiPhase == 90 || m_blupiAction == 24 && m_blupiPhase == 90 || m_blupiAction == 54 && m_blupiPhase == 100 || m_blupiAction == 57 && m_blupiPhase == 90)
             {
                 if (m_nbVies > 0)
                 {
@@ -5879,7 +5878,7 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 m_blupiFront = false;
             }
-            num2 = ((m_dimDecor.Y != 0) ? 6400 : 480);
+            num2 = m_dimDecor.Y != 0 ? 6400 : 480;
             if (m_blupiPos.Y >= num2 + 1 && m_blupiPos.Y <= num2 + 40)
             {
                 PlaySound(8, m_blupiPos);
@@ -6021,7 +6020,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             else
             {
-                m_blupiAction = ((m_random.Next() % 2 == 0) ? action1 : action2);
+                m_blupiAction = m_random.Next() % 2 == 0 ? action1 : action2;
             }
             m_blupiPhase = 0;
             m_blupiFocus = false;
@@ -6049,8 +6048,8 @@ namespace WindowsPhoneSpeedyBlupi
             StopSound(18);
             StopSound(29);
             StopSound(31);
-            TinyPoint pos = default(TinyPoint);
-            TinyPoint pos2 = default(TinyPoint);
+            TinyPoint pos = default;
+            TinyPoint pos2 = default;
             if (m_blupiAction == 75)
             {
                 pos.X = m_blupiPos.X - m_posDecor.X;
@@ -6080,7 +6079,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private TinyPoint GetPosDecor(TinyPoint pos)
         {
-            TinyPoint result = default(TinyPoint);
+            TinyPoint result = default;
             if (m_dimDecor.X == 0)
             {
                 result.X = 0;
@@ -6136,14 +6135,14 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 return true;
             }
-            int num = ((m_dimDecor.X != 0) ? 6400 : 640);
+            int num = m_dimDecor.X != 0 ? 6400 : 640;
             if (rect.Right > num)
             {
                 return true;
             }
             if (m_blupiHelico || m_blupiOver || m_blupiBalloon || m_blupiEcrase || m_blupiNage || m_blupiSurf)
             {
-                num = ((m_dimDecor.Y != 0) ? 6400 : 480);
+                num = m_dimDecor.Y != 0 ? 6400 : 480;
                 if (rect.Bottom > num)
                 {
                     return true;
@@ -6153,7 +6152,7 @@ namespace WindowsPhoneSpeedyBlupi
             int num3 = (rect.Right + 16 - 1) / 16;
             int num4 = rect.Top / 16;
             int num5 = (rect.Bottom + 16 - 1) / 16;
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             TinyRect dst;
             for (int i = num4; i <= num5; i++)
             {
@@ -6166,7 +6165,7 @@ namespace WindowsPhoneSpeedyBlupi
                         continue;
                     }
                     int icon = m_decor[num6, num7].icon;
-                    if (icon < 0 || icon >= MAXQUART || (m_blupiHelico && icon == 214) || (m_blupiOver && icon == 214) || (icon == 324 && m_time / 4 % 20 >= 18))
+                    if (icon < 0 || icon >= MAXQUART || m_blupiHelico && icon == 214 || m_blupiOver && icon == 214 || icon == 324 && m_time / 4 % 20 >= 18)
                     {
                         continue;
                     }
@@ -6211,7 +6210,7 @@ namespace WindowsPhoneSpeedyBlupi
             int num = Math.Abs(end.X - start.X);
             int num2 = Math.Abs(end.Y - start.Y);
             TinyPoint tinyPoint = start;
-            TinyRect rect2 = default(TinyRect);
+            TinyRect rect2 = default;
             if (num > num2)
             {
                 if (end.X > start.X)
@@ -6297,7 +6296,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             bool flag = false;
             TinyPoint blupiPos = m_blupiPos;
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = 0;
             tinyPoint.Y = 0;
             int num = 20;
@@ -6524,7 +6523,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void ActiveSwitch(bool bState, TinyPoint cel)
         {
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             pos.X = cel.X * 64;
             pos.Y = cel.Y * 64;
             ModifDecor(pos, bState ? 384 : 385);
@@ -6682,7 +6681,7 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 return false;
             }
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = pos.X / 64;
             tinyPoint.Y = pos.Y / 64;
             if (m_decor[tinyPoint.X, tinyPoint.Y].icon != 305)
@@ -6740,7 +6739,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private int IsDoor(TinyPoint pos, ref TinyPoint celPorte)
         {
-            int num = ((m_blupiDir != 1) ? 60 : (-60));
+            int num = m_blupiDir != 1 ? 60 : -60;
             pos.X += 30;
             for (int i = 0; i < 2; i++)
             {
@@ -6939,7 +6938,7 @@ namespace WindowsPhoneSpeedyBlupi
             int num = pos.Y * 13;
             num += pos.X / 8;
             int num2 = pos.X & 7;
-            return (m_balleTraj[num] & (1 << num2)) != 0;
+            return (m_balleTraj[num] & 1 << num2) != 0;
         }
 
         private void FlushMoveTraj()
@@ -6972,7 +6971,7 @@ namespace WindowsPhoneSpeedyBlupi
             int num = pos.Y * 13;
             num += pos.X / 8;
             int num2 = pos.X & 7;
-            return (m_moveTraj[num] & (1 << num2)) != 0;
+            return (m_moveTraj[num] & 1 << num2) != 0;
         }
 
         private int SearchDistRight(TinyPoint pos, TinyPoint dir, int type)
@@ -7009,7 +7008,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             int num = 0;
             bool flag = false;
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             pos.X += 30;
             pos.Y += 30;
             if (pos.X < 0 || pos.X >= 6400 || pos.Y < 0 || pos.Y >= 6400)
@@ -7098,7 +7097,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void StartSploutchGlu(TinyPoint pos)
         {
-            TinyPoint pos2 = default(TinyPoint);
+            TinyPoint pos2 = default;
             pos2.X = pos.X;
             pos2.Y = pos.Y;
             ObjectStart(pos2, 98, 0);
@@ -7145,7 +7144,7 @@ namespace WindowsPhoneSpeedyBlupi
                 TinyPoint tinyPoint = pos;
                 int num2 = speed;
                 int num3 = 0;
-                TinyPoint dir = default(TinyPoint);
+                TinyPoint dir = default;
                 if (num2 > 50)
                 {
                     num2 -= 50;
@@ -7283,12 +7282,12 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void MoveObjectStepLine(int i)
         {
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             bool flag = false;
-            TinyRect tinyRect = default(TinyRect);
+            TinyRect tinyRect = default;
             if ((m_moveObject[i].type == 1 || m_moveObject[i].type == 47 || m_moveObject[i].type == 48) && !m_blupiSuspend)
             {
-                TinyRect src = default(TinyRect);
+                TinyRect src = default;
                 src.Left = m_blupiPos.X + 20;
                 src.Right = m_blupiPos.X + 60 - 20;
                 src.Top = m_blupiPos.Y + 60 - 2;
@@ -7792,7 +7791,7 @@ namespace WindowsPhoneSpeedyBlupi
                     m_moveObject[i].channel = 9;
                 }
             }
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             if (m_moveObject[i].type == 52)
             {
                 if (m_moveObject[i].phase == 0)
@@ -8184,7 +8183,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if ((m_moveObject[i].step == 1 || m_moveObject[i].step == 3) && m_moveObject[i].time == 3)
                 {
                     int speed;
-                    if ((m_moveObject[i].posStart.X < m_moveObject[i].posEnd.X && m_moveObject[i].step == 1) || (m_moveObject[i].posStart.X > m_moveObject[i].posEnd.X && m_moveObject[i].step == 3))
+                    if (m_moveObject[i].posStart.X < m_moveObject[i].posEnd.X && m_moveObject[i].step == 1 || m_moveObject[i].posStart.X > m_moveObject[i].posEnd.X && m_moveObject[i].step == 3)
                     {
                         pos.X = m_moveObject[i].posCurrent.X - 30;
                         pos.Y = m_moveObject[i].posCurrent.Y + BLUPIOFFY;
@@ -8204,7 +8203,7 @@ namespace WindowsPhoneSpeedyBlupi
                 if ((m_moveObject[i].step == 1 || m_moveObject[i].step == 3) && m_moveObject[i].time == 21)
                 {
                     int speed;
-                    if ((m_moveObject[i].posStart.X < m_moveObject[i].posEnd.X && m_moveObject[i].step == 1) || (m_moveObject[i].posStart.X > m_moveObject[i].posEnd.X && m_moveObject[i].step == 3))
+                    if (m_moveObject[i].posStart.X < m_moveObject[i].posEnd.X && m_moveObject[i].step == 1 || m_moveObject[i].posStart.X > m_moveObject[i].posEnd.X && m_moveObject[i].step == 3)
                     {
                         pos.X = m_moveObject[i].posCurrent.X + 30;
                         pos.Y = m_moveObject[i].posCurrent.Y + BLUPIOFFY;
@@ -8314,14 +8313,14 @@ namespace WindowsPhoneSpeedyBlupi
                 m_decorAction = 1;
                 m_decorPhase = 0;
             }
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             src.Left = posStart.X;
             src.Right = posStart.X + 128;
             src.Top = posStart.Y;
             src.Bottom = posStart.Y + 128;
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.Y = posStart.Y / 64;
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             for (int j = 0; j < 2; j++)
             {
                 tinyPoint.X = posStart.X / 64;
@@ -8341,7 +8340,7 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 tinyPoint.Y++;
             }
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             for (i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type == 2 || m_moveObject[i].type == 3 || m_moveObject[i].type == 96 || m_moveObject[i].type == 97 || m_moveObject[i].type == 4 || m_moveObject[i].type == 6 || m_moveObject[i].type == 12 || m_moveObject[i].type == 13 || m_moveObject[i].type == 16 || m_moveObject[i].type == 17 || m_moveObject[i].type == 18 || m_moveObject[i].type == 19 || m_moveObject[i].type == 20 || m_moveObject[i].type == 24 || m_moveObject[i].type == 25 || m_moveObject[i].type == 26 || m_moveObject[i].type == 28 || m_moveObject[i].type == 30 || m_moveObject[i].type == 32 || m_moveObject[i].type == 33 || m_moveObject[i].type == 34 || m_moveObject[i].type == 40 || m_moveObject[i].type == 44 || m_moveObject[i].type == 46 || m_moveObject[i].type == 52 || m_moveObject[i].type == 54 || m_moveObject[i].type == 200 || m_moveObject[i].type == 201 || m_moveObject[i].type == 202 || m_moveObject[i].type == 203)
@@ -8393,9 +8392,9 @@ namespace WindowsPhoneSpeedyBlupi
                 return -1;
             }
             int num = newpos.Y - oldpos.Y;
-            int num2 = ((num >= 0) ? 30 : (-30));
+            int num2 = num >= 0 ? 30 : -30;
             num = Math.Abs(num);
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type != 1 && m_moveObject[i].type != 47 && m_moveObject[i].type != 48)
@@ -8498,7 +8497,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private bool TestPushCaisse(int i, TinyPoint pos, bool bPop)
         {
-            TinyPoint move = default(TinyPoint);
+            TinyPoint move = default;
             move.X = pos.X - m_moveObject[i].posCurrent.X;
             move.Y = 0;
             SearchLinkCaisse(i, bPop);
@@ -8523,8 +8522,8 @@ namespace WindowsPhoneSpeedyBlupi
 
         private bool TestPushOneCaisse(int i, TinyPoint move, int b)
         {
-            TinyRect rect = default(TinyRect);
-            int num = (rect.Left = m_moveObject[i].posCurrent.X + move.X);
+            TinyRect rect = default;
+            int num = rect.Left = m_moveObject[i].posCurrent.X + move.X;
             rect.Right = num + 64;
             rect.Top = m_moveObject[i].posCurrent.Y;
             rect.Bottom = m_moveObject[i].posCurrent.Y + 64;
@@ -8561,15 +8560,15 @@ namespace WindowsPhoneSpeedyBlupi
             AddLinkCaisse(rank);
             TinyPoint posCurrent = m_moveObject[rank].posCurrent;
             bool flag;
-            TinyRect src = default(TinyRect);
-            TinyRect src2 = default(TinyRect);
+            TinyRect src = default;
+            TinyRect src2 = default;
             do
             {
                 flag = false;
                 for (int i = 0; i < m_nbLinkCaisse; i++)
                 {
                     int num = m_linkCaisse[i];
-                    if (m_moveObject[num].posCurrent.Y > posCurrent.Y || (bPop && (m_moveObject[num].posCurrent.X < posCurrent.X - 32 || m_moveObject[num].posCurrent.X > posCurrent.X + 32)))
+                    if (m_moveObject[num].posCurrent.Y > posCurrent.Y || bPop && (m_moveObject[num].posCurrent.X < posCurrent.X - 32 || m_moveObject[num].posCurrent.X > posCurrent.X + 32))
                     {
                         continue;
                     }
@@ -8580,7 +8579,7 @@ namespace WindowsPhoneSpeedyBlupi
                     for (int j = 0; j < m_nbRankCaisse; j++)
                     {
                         int num2 = m_rankCaisse[j];
-                        if (num2 != num && m_moveObject[num2].posCurrent.Y <= posCurrent.Y && (!bPop || (m_moveObject[num2].posCurrent.X >= posCurrent.X - 32 && m_moveObject[num2].posCurrent.X <= posCurrent.X + 32)))
+                        if (num2 != num && m_moveObject[num2].posCurrent.Y <= posCurrent.Y && (!bPop || m_moveObject[num2].posCurrent.X >= posCurrent.X - 32 && m_moveObject[num2].posCurrent.X <= posCurrent.X + 32))
                         {
                             src2.Left = m_moveObject[num2].posCurrent.X - 1;
                             src2.Top = m_moveObject[num2].posCurrent.Y - 1;
@@ -8614,7 +8613,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private int CaisseInFront()
         {
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             if (m_blupiDir == 1)
             {
                 tinyPoint.X = m_blupiPos.X + 16 - 32;
@@ -8666,7 +8665,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (m_blupiAir)
             {
-                TinyPoint tinyPoint = default(TinyPoint);
+                TinyPoint tinyPoint = default;
                 tinyPoint.X = pos.X + 30;
                 tinyPoint.Y = pos.Y + 30 + 64;
                 if (tinyPoint.X >= 0 && tinyPoint.X < 6400 && tinyPoint.Y >= 0 && tinyPoint.Y < 6400)
@@ -8687,7 +8686,7 @@ namespace WindowsPhoneSpeedyBlupi
                     }
                 }
             }
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             src.Left = pos.X;
             src.Right = pos.X + 60;
             src.Top = pos.Y + 11;
@@ -8696,7 +8695,7 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 src.Bottom += 90;
             }
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type != 2 && m_moveObject[i].type != 16 && m_moveObject[i].type != 96 && m_moveObject[i].type != 97 && m_moveObject[i].type != 4 && m_moveObject[i].type != 20 && m_moveObject[i].type != 44 && m_moveObject[i].type != 54 && m_moveObject[i].type != 23 && m_moveObject[i].type != 32 && m_moveObject[i].type != 33)
@@ -8747,12 +8746,12 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 return false;
             }
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             src.Left = pos.X + 16;
             src.Right = pos.X + 60 - 16;
             src.Top = pos.Y + 11;
             src.Bottom = pos.Y + 60 - 2;
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             src2.Left = m_blupiPos.X - 16 - 40;
             src2.Right = m_blupiPos.X + 60 + 16 + 40;
             src2.Top = m_blupiPos.Y + 11 - 40;
@@ -8774,7 +8773,7 @@ namespace WindowsPhoneSpeedyBlupi
             TinyRect src = BlupiRect(pos);
             src.Left = pos.X + 16;
             src.Right = pos.X + 60 - 16;
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type == 96)
@@ -8798,15 +8797,15 @@ namespace WindowsPhoneSpeedyBlupi
             TinyRect src = BlupiRect(pos);
             src.Left = pos.X + 16;
             src.Right = pos.X + 60 - 16;
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             src2.Left = src.Left - 20;
             src2.Right = src.Right + 20;
             src2.Top = src.Top - 40;
             src2.Bottom = src.Bottom + 30;
-            TinyRect src3 = default(TinyRect);
+            TinyRect src3 = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
-                if (m_moveObject[i].type == 0 || m_moveObject[i].type == 27 || m_moveObject[i].type == 57 || m_moveObject[i].type == 39 || m_moveObject[i].type == 58 || m_moveObject[i].type == 34 || m_moveObject[i].type == 37 || m_moveObject[i].type == 38 || ((m_blupiAction == 14 || m_blupiAction == 29) && m_moveObject[i].type == 12))
+                if (m_moveObject[i].type == 0 || m_moveObject[i].type == 27 || m_moveObject[i].type == 57 || m_moveObject[i].type == 39 || m_moveObject[i].type == 58 || m_moveObject[i].type == 34 || m_moveObject[i].type == 37 || m_moveObject[i].type == 38 || (m_blupiAction == 14 || m_blupiAction == 29) && m_moveObject[i].type == 12)
                 {
                     continue;
                 }
@@ -8872,12 +8871,12 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 return -1;
             }
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             src.Left = pos.X + 12;
             src.Right = pos.X + 60 - 12;
             src.Top = pos.Y + 60 - 2;
             src.Bottom = pos.Y + 60 + height - 1;
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type == 1 || m_moveObject[i].type == 47 || m_moveObject[i].type == 48)
@@ -8898,12 +8897,12 @@ namespace WindowsPhoneSpeedyBlupi
 
         private int MoveChargeDetect(TinyPoint pos)
         {
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             src.Left = pos.X + 16;
             src.Right = pos.X + 60 - 16;
             src.Top = pos.Y + 11;
             src.Bottom = pos.Y + 60 - 2;
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type == 31)
@@ -8924,12 +8923,12 @@ namespace WindowsPhoneSpeedyBlupi
 
         private int MovePersoDetect(TinyPoint pos)
         {
-            TinyRect src = default(TinyRect);
+            TinyRect src = default;
             src.Left = pos.X + 16;
             src.Right = pos.X + 60 - 16;
             src.Top = pos.Y + 11;
             src.Bottom = pos.Y + 60 - 2;
-            TinyRect src2 = default(TinyRect);
+            TinyRect src2 = default;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
                 if (m_moveObject[i].type >= 200 && m_moveObject[i].type <= 203)
@@ -9001,7 +9000,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void MoveObjectSort()
         {
-            MoveObject dst = default(MoveObject);
+            MoveObject dst = default;
             int num = 0;
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
@@ -9040,7 +9039,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void MoveObjectPriority(int i)
         {
-            MoveObject dst = default(MoveObject);
+            MoveObject dst = default;
             if (i == 0 || m_moveObject[i].type != 23)
             {
                 return;
@@ -9074,7 +9073,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             for (int i = 0; i < MAXMOVEOBJECT; i++)
             {
-                if (m_moveObject[i].type == 0 || (type != -1 && m_moveObject[i].type != type))
+                if (m_moveObject[i].type == 0 || type != -1 && m_moveObject[i].type != type)
                 {
                     continue;
                 }
@@ -9177,7 +9176,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             foreach (ByeByeObject byeByeObject in byeByeObjects)
             {
-                TinyPoint tinyPoint = default(TinyPoint);
+                TinyPoint tinyPoint = default;
                 tinyPoint.X = m_drawBounds.Left + (int)byeByeObject.posX - posDecor.X;
                 tinyPoint.Y = m_drawBounds.Top + (int)byeByeObject.posY - posDecor.Y;
                 TinyPoint pos = tinyPoint;
@@ -9187,7 +9186,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private TinyPoint VoyageGetPosVie(int nbVies)
         {
-            TinyPoint result = default(TinyPoint);
+            TinyPoint result = default;
             result.X = 210 + 16 * nbVies;
             result.Y = 417;
             return result;
@@ -9351,7 +9350,7 @@ namespace WindowsPhoneSpeedyBlupi
                     num = 0;
                 }
             }
-            TinyPoint pos = default(TinyPoint);
+            TinyPoint pos = default;
             pos.X = m_voyageStart.X + (m_voyageEnd.X - m_voyageStart.X) * num / m_voyageTotal;
             pos.Y = m_voyageStart.Y + (m_voyageEnd.Y - m_voyageStart.Y) * num / m_voyageTotal;
             if (m_voyageIcon != 40 || m_voyageChannel != 10 || num != 0)
@@ -9387,8 +9386,8 @@ namespace WindowsPhoneSpeedyBlupi
 
         private bool IsRightBorder(int x, int y, int dx, int dy)
         {
-            int num = ((m_dimDecor.X != 0) ? 100 : 10);
-            int num2 = ((m_dimDecor.Y != 0) ? 100 : 8);
+            int num = m_dimDecor.X != 0 ? 100 : 10;
+            int num2 = m_dimDecor.Y != 0 ? 100 : 8;
             if (x < 0 || x >= num || y < 0 || y >= num2)
             {
                 return true;
@@ -10228,14 +10227,14 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 for (int j = 0; j < 100; j++)
                 {
-                    m_decor[j, i].icon = Worlds.GetDecorField(lines, "Decor", j, i) ?? (-1);
+                    m_decor[j, i].icon = Worlds.GetDecorField(lines, "Decor", j, i) ?? -1;
                 }
             }
             for (int k = 0; k < 100; k++)
             {
                 for (int l = 0; l < 100; l++)
                 {
-                    m_bigDecor[l, k].icon = Worlds.GetDecorField(lines, "BigDecor", l, k) ?? (-1);
+                    m_bigDecor[l, k].icon = Worlds.GetDecorField(lines, "BigDecor", l, k) ?? -1;
                 }
             }
             for (int m = 0; m < MAXMOVEOBJECT; m++)
@@ -10291,14 +10290,14 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 for (int j = 0; j < 100; j++)
                 {
-                    m_decor[j, i].icon = Worlds.GetDecorField(array, "Decor", j, i) ?? (-1);
+                    m_decor[j, i].icon = Worlds.GetDecorField(array, "Decor", j, i) ?? -1;
                 }
             }
             for (int k = 0; k < 100; k++)
             {
                 for (int l = 0; l < 100; l++)
                 {
-                    m_bigDecor[l, k].icon = Worlds.GetDecorField(array, "BigDecor", l, k) ?? (-1);
+                    m_bigDecor[l, k].icon = Worlds.GetDecorField(array, "BigDecor", l, k) ?? -1;
                 }
             }
             for (int m = 0; m < MAXMOVEOBJECT; m++)
@@ -10447,7 +10446,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             if (m_mission == 1)
             {
-                TinyPoint blupi = default(TinyPoint);
+                TinyPoint blupi = default;
                 int dir = 0;
                 if (SearchWorld(lastWorld, ref blupi, ref dir))
                 {
@@ -10459,8 +10458,8 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void AdaptDoors(bool bPrivate)
         {
-            TinyPoint cel = default(TinyPoint);
-            TinyPoint blupi = default(TinyPoint);
+            TinyPoint cel = default;
+            TinyPoint blupi = default;
             m_bPrivate = bPrivate;
             if (m_bPrivate)
             {
@@ -10539,7 +10538,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void OpenDoorsTresor()
         {
-            TinyPoint cel = default(TinyPoint);
+            TinyPoint cel = default;
             for (int i = 0; i < 100; i++)
             {
                 for (int j = 0; j < 100; j++)
diff --git a/Def.cs b/WindowsPhoneSpeedyBlupi/Def.cs
similarity index 94%
rename from Def.cs
rename to WindowsPhoneSpeedyBlupi/Def.cs
index a3d6399..cf02b77 100644
--- a/Def.cs
+++ b/WindowsPhoneSpeedyBlupi/Def.cs
@@ -1,25 +1,23 @@
 // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439
 // WindowsPhoneSpeedyBlupi.Def
 
-
-
 namespace WindowsPhoneSpeedyBlupi
 {
 
     public static class Def
     {
         public const bool DETAILED_DEBUGGING = false;
-        
+
         public const Platform PLATFORM = Platform.Android;
-        
+
         public enum Platform
         {
-        	Desktop,
-        	Android,
-        	iOS,
-        	Web
+            Desktop,
+            Android,
+            iOS,
+            Web
         }
-        
+
         public enum Phase
         {
             None,
@@ -37,7 +35,7 @@ namespace WindowsPhoneSpeedyBlupi
             Ranking
         }
 
-        public enum ButtonGlygh
+        public enum ButtonGlyph
         {
             None,
             InitGamerA,
diff --git a/Game1.cs b/WindowsPhoneSpeedyBlupi/Game1.cs
similarity index 79%
rename from Game1.cs
rename to WindowsPhoneSpeedyBlupi/Game1.cs
index f5d90e4..9f3bf98 100644
--- a/Game1.cs
+++ b/WindowsPhoneSpeedyBlupi/Game1.cs
@@ -6,7 +6,6 @@ using Microsoft.Xna.Framework.GamerServices;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Input.Touch;
 using Microsoft.Xna.Framework.Media;
-using WindowsPhoneSpeedyBlupi;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace WindowsPhoneSpeedyBlupi
@@ -20,18 +19,18 @@ namespace WindowsPhoneSpeedyBlupi
         0.94, 91.0, 1.0, 100.0
         };
 
-        private static readonly Def.ButtonGlygh[] cheatGeste = new Def.ButtonGlygh[10]
+        private static readonly Def.ButtonGlyph[] cheatGeste = new Def.ButtonGlyph[10]
         {
-        Def.ButtonGlygh.Cheat12,
-        Def.ButtonGlygh.Cheat22,
-        Def.ButtonGlygh.Cheat32,
-        Def.ButtonGlygh.Cheat12,
-        Def.ButtonGlygh.Cheat11,
-        Def.ButtonGlygh.Cheat21,
-        Def.ButtonGlygh.Cheat22,
-        Def.ButtonGlygh.Cheat21,
-        Def.ButtonGlygh.Cheat31,
-        Def.ButtonGlygh.Cheat32
+        Def.ButtonGlyph.Cheat12,
+        Def.ButtonGlyph.Cheat22,
+        Def.ButtonGlyph.Cheat32,
+        Def.ButtonGlyph.Cheat12,
+        Def.ButtonGlyph.Cheat11,
+        Def.ButtonGlyph.Cheat21,
+        Def.ButtonGlyph.Cheat22,
+        Def.ButtonGlyph.Cheat21,
+        Def.ButtonGlyph.Cheat31,
+        Def.ButtonGlyph.Cheat32
         };
 
         private readonly GraphicsDeviceManager graphics;
@@ -99,16 +98,16 @@ namespace WindowsPhoneSpeedyBlupi
         public Game1()
         {
             Exiting += OnExiting;
-            if(!TouchPanel.GetCapabilities().IsConnected)
+            if (!TouchPanel.GetCapabilities().IsConnected)
             {
-                this.IsMouseVisible = true;
+                IsMouseVisible = true;
                 Mouse.SetCursor(MouseCursor.Arrow);
             }
             graphics = new GraphicsDeviceManager(this);
             graphics.IsFullScreen = false;
-            base.Content.RootDirectory = "Content";
-            base.TargetElapsedTime = TimeSpan.FromTicks(500000L);
-            base.InactiveSleepTime = TimeSpan.FromSeconds(1.0);
+            Content.RootDirectory = "Content";
+            TargetElapsedTime = TimeSpan.FromTicks(500000L);
+            InactiveSleepTime = TimeSpan.FromSeconds(1.0);
             missionToStart1 = -1;
             missionToStart2 = -1;
             gameData = new GameData();
@@ -227,7 +226,7 @@ namespace WindowsPhoneSpeedyBlupi
                     }
                 }
                 long num = gameTime.TotalGameTime.Ticks - startTime.Ticks;
-                waitProgress = (double)num / 50000000.0;
+                waitProgress = num / 50000000.0;
                 if (waitProgress > 1.0)
                 {
                     SetPhase(Def.Phase.Init);
@@ -235,41 +234,41 @@ namespace WindowsPhoneSpeedyBlupi
                 return;
             }
             inputPad.Update();
-            Def.ButtonGlygh buttonPressed = inputPad.ButtonPressed;
-            if (buttonPressed >= Def.ButtonGlygh.InitGamerA && buttonPressed <= Def.ButtonGlygh.InitGamerC)
+            Def.ButtonGlyph buttonPressed = inputPad.ButtonPressed;
+            if (buttonPressed >= Def.ButtonGlyph.InitGamerA && buttonPressed <= Def.ButtonGlyph.InitGamerC)
             {
                 SetGamer((int)(buttonPressed - 1));
                 return;
             }
             switch (buttonPressed)
             {
-                case Def.ButtonGlygh.InitSetup:
+                case Def.ButtonGlyph.InitSetup:
                     SetPhase(Def.Phase.MainSetup);
                     return;
-                case Def.ButtonGlygh.PauseSetup:
+                case Def.ButtonGlyph.PauseSetup:
                     SetPhase(Def.Phase.PlaySetup);
                     return;
-                case Def.ButtonGlygh.SetupSounds:
+                case Def.ButtonGlyph.SetupSounds:
                     gameData.Sounds = !gameData.Sounds;
                     gameData.Write();
                     return;
-                case Def.ButtonGlygh.SetupJump:
+                case Def.ButtonGlyph.SetupJump:
                     gameData.JumpRight = !gameData.JumpRight;
                     gameData.Write();
                     return;
-                case Def.ButtonGlygh.SetupZoom:
+                case Def.ButtonGlyph.SetupZoom:
                     gameData.AutoZoom = !gameData.AutoZoom;
                     gameData.Write();
                     return;
-                case Def.ButtonGlygh.SetupAccel:
+                case Def.ButtonGlyph.SetupAccel:
                     gameData.AccelActive = !gameData.AccelActive;
                     gameData.Write();
                     return;
-                case Def.ButtonGlygh.SetupReset:
+                case Def.ButtonGlyph.SetupReset:
                     gameData.Reset();
                     gameData.Write();
                     return;
-                case Def.ButtonGlygh.SetupReturn:
+                case Def.ButtonGlyph.SetupReturn:
                     if (playSetup)
                     {
                         SetPhase(Def.Phase.Play, -1);
@@ -279,50 +278,50 @@ namespace WindowsPhoneSpeedyBlupi
                         SetPhase(Def.Phase.Init);
                     }
                     return;
-                case Def.ButtonGlygh.InitPlay:
+                case Def.ButtonGlyph.InitPlay:
                     SetPhase(Def.Phase.Play, 1);
                     return;
-                case Def.ButtonGlygh.PlayPause:
+                case Def.ButtonGlyph.PlayPause:
                     SetPhase(Def.Phase.Pause);
                     return;
-                case Def.ButtonGlygh.WinLostReturn:
-                case Def.ButtonGlygh.PauseMenu:
-                case Def.ButtonGlygh.ResumeMenu:
+                case Def.ButtonGlyph.WinLostReturn:
+                case Def.ButtonGlyph.PauseMenu:
+                case Def.ButtonGlyph.ResumeMenu:
                     SetPhase(Def.Phase.Init);
                     break;
             }
             switch (buttonPressed)
             {
-                case Def.ButtonGlygh.ResumeContinue:
+                case Def.ButtonGlyph.ResumeContinue:
                     ContinueMission();
                     return;
-                case Def.ButtonGlygh.InitBuy:
-                case Def.ButtonGlygh.TrialBuy:
+                case Def.ButtonGlyph.InitBuy:
+                case Def.ButtonGlyph.TrialBuy:
                     Guide.Show(PlayerIndex.One);
                     SetPhase(Def.Phase.Init);
                     return;
-                case Def.ButtonGlygh.InitRanking:
+                case Def.ButtonGlyph.InitRanking:
                     SetPhase(Def.Phase.Ranking);
                     return;
-                case Def.ButtonGlygh.TrialCancel:
-                case Def.ButtonGlygh.RankingContinue:
+                case Def.ButtonGlyph.TrialCancel:
+                case Def.ButtonGlyph.RankingContinue:
                     SetPhase(Def.Phase.Init);
                     return;
-                case Def.ButtonGlygh.PauseBack:
+                case Def.ButtonGlyph.PauseBack:
                     MissionBack();
                     return;
-                case Def.ButtonGlygh.PauseRestart:
+                case Def.ButtonGlyph.PauseRestart:
                     SetPhase(Def.Phase.Play, mission);
                     return;
-                case Def.ButtonGlygh.PauseContinue:
+                case Def.ButtonGlyph.PauseContinue:
                     SetPhase(Def.Phase.Play, -1);
                     return;
-                case Def.ButtonGlygh.Cheat11:
-                case Def.ButtonGlygh.Cheat12:
-                case Def.ButtonGlygh.Cheat21:
-                case Def.ButtonGlygh.Cheat22:
-                case Def.ButtonGlygh.Cheat31:
-                case Def.ButtonGlygh.Cheat32:
+                case Def.ButtonGlyph.Cheat11:
+                case Def.ButtonGlyph.Cheat12:
+                case Def.ButtonGlyph.Cheat21:
+                case Def.ButtonGlyph.Cheat22:
+                case Def.ButtonGlyph.Cheat31:
+                case Def.ButtonGlyph.Cheat32:
                     if (buttonPressed == cheatGeste[cheatGesteIndex])
                     {
                         cheatGesteIndex++;
@@ -344,7 +343,7 @@ namespace WindowsPhoneSpeedyBlupi
                     }
                     break;
             }
-            if (buttonPressed >= Def.ButtonGlygh.Cheat1 && buttonPressed <= Def.ButtonGlygh.Cheat9)
+            if (buttonPressed >= Def.ButtonGlyph.Cheat1 && buttonPressed <= Def.ButtonGlyph.Cheat9)
             {
                 CheatAction(buttonPressed);
             }
@@ -380,7 +379,7 @@ namespace WindowsPhoneSpeedyBlupi
                 SetPhase(Def.Phase.Init);
                 return;
             }
-            num = ((num % 10 == 0) ? 1 : (num / 10 * 10));
+            num = num % 10 == 0 ? 1 : num / 10 * 10;
             SetPhase(Def.Phase.Play, num);
         }
 
@@ -421,35 +420,35 @@ namespace WindowsPhoneSpeedyBlupi
             inputPad.StartMission(mission);
         }
 
-        private void CheatAction(Def.ButtonGlygh glyph)
+        private void CheatAction(Def.ButtonGlyph glyph)
         {
             switch (glyph)
             {
-                case Def.ButtonGlygh.Cheat1:
+                case Def.ButtonGlyph.Cheat1:
                     decor.CheatAction(Tables.CheatCodes.OpenDoors);
                     break;
-                case Def.ButtonGlygh.Cheat2:
+                case Def.ButtonGlyph.Cheat2:
                     decor.CheatAction(Tables.CheatCodes.SuperBlupi);
                     break;
-                case Def.ButtonGlygh.Cheat3:
+                case Def.ButtonGlyph.Cheat3:
                     decor.CheatAction(Tables.CheatCodes.ShowSecret);
                     break;
-                case Def.ButtonGlygh.Cheat4:
+                case Def.ButtonGlyph.Cheat4:
                     decor.CheatAction(Tables.CheatCodes.LayEgg);
                     break;
-                case Def.ButtonGlygh.Cheat5:
+                case Def.ButtonGlyph.Cheat5:
                     gameData.Reset();
                     break;
-                case Def.ButtonGlygh.Cheat6:
+                case Def.ButtonGlyph.Cheat6:
                     simulateTrialMode = !simulateTrialMode;
                     break;
-                case Def.ButtonGlygh.Cheat7:
+                case Def.ButtonGlyph.Cheat7:
                     decor.CheatAction(Tables.CheatCodes.CleanAll);
                     break;
-                case Def.ButtonGlygh.Cheat8:
+                case Def.ButtonGlyph.Cheat8:
                     decor.CheatAction(Tables.CheatCodes.AllTreasure);
                     break;
-                case Def.ButtonGlygh.Cheat9:
+                case Def.ButtonGlyph.Cheat9:
                     decor.CheatAction(Tables.CheatCodes.EndGoal);
                     break;
             }
@@ -496,13 +495,13 @@ namespace WindowsPhoneSpeedyBlupi
         {
             if (phase == Def.Phase.Init)
             {
-                double num = Math.Min((double)phaseTime / 20.0, 1.0);
+                double num = Math.Min(phaseTime / 20.0, 1.0);
                 TinyRect rect;
                 double opacity;
                 if (fadeOutPhase == Def.Phase.MainSetup)
                 {
                     num = (1.0 - num) * (1.0 - num);
-                    TinyRect tinyRect = default(TinyRect);
+                    TinyRect tinyRect = default;
                     tinyRect.Left = (int)(720.0 - 640.0 * num);
                     tinyRect.Right = (int)(1360.0 - 640.0 * num);
                     tinyRect.Top = 0;
@@ -512,8 +511,8 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 else
                 {
-                    num = ((fadeOutPhase != 0) ? (1.0 - num * 2.0) : (1.0 - (1.0 - num) * (1.0 - num)));
-                    TinyRect tinyRect2 = default(TinyRect);
+                    num = fadeOutPhase != 0 ? 1.0 - num * 2.0 : 1.0 - (1.0 - num) * (1.0 - num);
+                    TinyRect tinyRect2 = default;
                     tinyRect2.Left = 80;
                     tinyRect2.Right = 720;
                     tinyRect2.Top = (int)(-160.0 + num * 160.0);
@@ -525,7 +524,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (phase == Def.Phase.Init)
             {
-                double num = Math.Min((double)phaseTime / 20.0, 1.0);
+                double num = Math.Min(phaseTime / 20.0, 1.0);
                 double opacity;
                 if (fadeOutPhase == Def.Phase.MainSetup)
                 {
@@ -542,7 +541,7 @@ namespace WindowsPhoneSpeedyBlupi
                     opacity = 1.0 - num;
                     num = 1.0 + num * 10.0;
                 }
-                TinyRect tinyRect3 = default(TinyRect);
+                TinyRect tinyRect3 = default;
                 tinyRect3.Left = (int)(468.0 - 205.0 * num);
                 tinyRect3.Right = (int)(468.0 + 205.0 * num);
                 tinyRect3.Top = (int)(280.0 - 190.0 * num);
@@ -554,10 +553,10 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 if (fadeOutPhase == Def.Phase.Play)
                 {
-                    double num = Math.Min((double)phaseTime / 20.0, 1.0);
+                    double num = Math.Min(phaseTime / 20.0, 1.0);
                     double opacity = 1.0 - num;
                     num = 1.0 + num * 10.0;
-                    TinyRect tinyRect4 = default(TinyRect);
+                    TinyRect tinyRect4 = default;
                     tinyRect4.Left = (int)(418.0 - 205.0 * num);
                     tinyRect4.Right = (int)(418.0 + 205.0 * num);
                     tinyRect4.Top = (int)(190.0 - 190.0 * num);
@@ -567,9 +566,9 @@ namespace WindowsPhoneSpeedyBlupi
                 }
                 else if (fadeOutPhase == Def.Phase.PlaySetup)
                 {
-                    double num = Math.Min((double)phaseTime / 20.0, 1.0);
+                    double num = Math.Min(phaseTime / 20.0, 1.0);
                     num *= num;
-                    TinyRect tinyRect5 = default(TinyRect);
+                    TinyRect tinyRect5 = default;
                     tinyRect5.Left = (int)(213.0 + 800.0 * num);
                     tinyRect5.Right = (int)(623.0 + 800.0 * num);
                     tinyRect5.Top = 0;
@@ -582,14 +581,14 @@ namespace WindowsPhoneSpeedyBlupi
                     double num;
                     if (fadeOutPhase == Def.Phase.None)
                     {
-                        num = Math.Min((double)phaseTime / 15.0, 1.0);
+                        num = Math.Min(phaseTime / 15.0, 1.0);
                     }
                     else
                     {
-                        num = Math.Min((double)phaseTime / 15.0, 1.0);
+                        num = Math.Min(phaseTime / 15.0, 1.0);
                         num = 1.0 - num;
                     }
-                    TinyRect tinyRect6 = default(TinyRect);
+                    TinyRect tinyRect6 = default;
                     tinyRect6.Left = (int)(418.0 - 205.0 * num);
                     tinyRect6.Right = (int)(418.0 + 205.0 * num);
                     tinyRect6.Top = (int)(190.0 - 190.0 * num);
@@ -608,37 +607,37 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (phase == Def.Phase.MainSetup || phase == Def.Phase.PlaySetup)
             {
-                double num = Math.Min((double)phaseTime / 20.0, 1.0);
+                double num = Math.Min(phaseTime / 20.0, 1.0);
                 num = 1.0 - (1.0 - num) * (1.0 - num);
                 double num2;
                 if (phaseTime < 20)
                 {
-                    num2 = (double)phaseTime / 20.0;
+                    num2 = phaseTime / 20.0;
                     num2 = 1.0 - (1.0 - num2) * (1.0 - num2);
                 }
                 else
                 {
-                    num2 = 1.0 + ((double)phaseTime - 20.0) / 400.0;
+                    num2 = 1.0 + (phaseTime - 20.0) / 400.0;
                 }
                 if (fadeOutPhase != 0)
                 {
                     num = 1.0 - num;
                     num2 = 1.0 - num2;
                 }
-                TinyRect tinyRect7 = default(TinyRect);
+                TinyRect tinyRect7 = default;
                 tinyRect7.Left = (int)(720.0 - 640.0 * num);
                 tinyRect7.Right = (int)(1360.0 - 640.0 * num);
                 tinyRect7.Top = 0;
                 tinyRect7.Bottom = 160;
                 TinyRect rect = tinyRect7;
                 pixmap.DrawIcon(15, 0, rect, num * num, false);
-                TinyRect tinyRect8 = default(TinyRect);
+                TinyRect tinyRect8 = default;
                 tinyRect8.Left = 487;
                 tinyRect8.Right = 713;
                 tinyRect8.Top = 148;
                 tinyRect8.Bottom = 374;
                 TinyRect rect2 = tinyRect8;
-                TinyRect tinyRect9 = default(TinyRect);
+                TinyRect tinyRect9 = default;
                 tinyRect9.Left = 118;
                 tinyRect9.Right = 570;
                 tinyRect9.Top = 268;
@@ -651,8 +650,8 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (phase == Def.Phase.Lost)
             {
-                double num = Math.Min((double)phaseTime / 100.0, 1.0);
-                TinyRect tinyRect10 = default(TinyRect);
+                double num = Math.Min(phaseTime / 100.0, 1.0);
+                TinyRect tinyRect10 = default;
                 tinyRect10.Left = (int)(418.0 - 205.0 * num);
                 tinyRect10.Right = (int)(418.0 + 205.0 * num);
                 tinyRect10.Top = (int)(238.0 - 190.0 * num);
@@ -670,8 +669,8 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (phase == Def.Phase.Win)
             {
-                double num = Math.Sin((double)phaseTime / 3.0) / 2.0 + 1.0;
-                TinyRect tinyRect11 = default(TinyRect);
+                double num = Math.Sin(phaseTime / 3.0) / 2.0 + 1.0;
+                TinyRect tinyRect11 = default;
                 tinyRect11.Left = (int)(418.0 - 205.0 * num);
                 tinyRect11.Right = (int)(418.0 + 205.0 * num);
                 tinyRect11.Top = (int)(238.0 - 190.0 * num);
@@ -688,17 +687,17 @@ namespace WindowsPhoneSpeedyBlupi
                 TinyRect drawBounds = pixmap.DrawBounds;
                 int width = drawBounds.Width;
                 int height = drawBounds.Height;
-                TinyRect tinyRect = default(TinyRect);
+                TinyRect tinyRect = default;
                 tinyRect.Left = 10;
                 tinyRect.Right = 260;
                 tinyRect.Top = height - 325;
                 tinyRect.Bottom = height - 10;
                 TinyRect rect = tinyRect;
                 pixmap.DrawIcon(14, 15, rect, 0.3, false);
-                TinyRect tinyRect2 = default(TinyRect);
+                TinyRect tinyRect2 = default;
                 tinyRect2.Left = width - 170;
                 tinyRect2.Right = width - 10;
-                tinyRect2.Top = height - ((IsTrialMode || IsRankingMode) ? 325 : 195);
+                tinyRect2.Top = height - (IsTrialMode || IsRankingMode ? 325 : 195);
                 tinyRect2.Bottom = height - 10;
                 rect = tinyRect2;
                 pixmap.DrawIcon(14, 15, rect, 0.3, false);
@@ -709,54 +708,54 @@ namespace WindowsPhoneSpeedyBlupi
         {
             if (phase == Def.Phase.Init)
             {
-                DrawButtonGamerText(Def.ButtonGlygh.InitGamerA, 0);
-                DrawButtonGamerText(Def.ButtonGlygh.InitGamerB, 1);
-                DrawButtonGamerText(Def.ButtonGlygh.InitGamerC, 2);
-                DrawTextUnderButton(Def.ButtonGlygh.InitPlay, MyResource.TX_BUTTON_PLAY);
-                DrawTextRightButton(Def.ButtonGlygh.InitSetup, MyResource.TX_BUTTON_SETUP);
+                DrawButtonGamerText(Def.ButtonGlyph.InitGamerA, 0);
+                DrawButtonGamerText(Def.ButtonGlyph.InitGamerB, 1);
+                DrawButtonGamerText(Def.ButtonGlyph.InitGamerC, 2);
+                DrawTextUnderButton(Def.ButtonGlyph.InitPlay, MyResource.TX_BUTTON_PLAY);
+                DrawTextRightButton(Def.ButtonGlyph.InitSetup, MyResource.TX_BUTTON_SETUP);
                 if (IsTrialMode)
                 {
-                    DrawTextUnderButton(Def.ButtonGlygh.InitBuy, MyResource.TX_BUTTON_BUY);
+                    DrawTextUnderButton(Def.ButtonGlyph.InitBuy, MyResource.TX_BUTTON_BUY);
                 }
                 if (IsRankingMode)
                 {
-                    DrawTextUnderButton(Def.ButtonGlygh.InitRanking, MyResource.TX_BUTTON_RANKING);
+                    DrawTextUnderButton(Def.ButtonGlyph.InitRanking, MyResource.TX_BUTTON_RANKING);
                 }
             }
             if (phase == Def.Phase.Pause)
             {
-                DrawTextUnderButton(Def.ButtonGlygh.PauseMenu, MyResource.TX_BUTTON_MENU);
+                DrawTextUnderButton(Def.ButtonGlyph.PauseMenu, MyResource.TX_BUTTON_MENU);
                 if (mission != 1)
                 {
-                    DrawTextUnderButton(Def.ButtonGlygh.PauseBack, MyResource.TX_BUTTON_BACK);
+                    DrawTextUnderButton(Def.ButtonGlyph.PauseBack, MyResource.TX_BUTTON_BACK);
                 }
-                DrawTextUnderButton(Def.ButtonGlygh.PauseSetup, MyResource.TX_BUTTON_SETUP);
+                DrawTextUnderButton(Def.ButtonGlyph.PauseSetup, MyResource.TX_BUTTON_SETUP);
                 if (mission != 1 && mission % 10 != 0)
                 {
-                    DrawTextUnderButton(Def.ButtonGlygh.PauseRestart, MyResource.TX_BUTTON_RESTART);
+                    DrawTextUnderButton(Def.ButtonGlyph.PauseRestart, MyResource.TX_BUTTON_RESTART);
                 }
-                DrawTextUnderButton(Def.ButtonGlygh.PauseContinue, MyResource.TX_BUTTON_CONTINUE);
+                DrawTextUnderButton(Def.ButtonGlyph.PauseContinue, MyResource.TX_BUTTON_CONTINUE);
             }
             if (phase == Def.Phase.Resume)
             {
-                DrawTextUnderButton(Def.ButtonGlygh.ResumeMenu, MyResource.TX_BUTTON_MENU);
-                DrawTextUnderButton(Def.ButtonGlygh.ResumeContinue, MyResource.TX_BUTTON_CONTINUE);
+                DrawTextUnderButton(Def.ButtonGlyph.ResumeMenu, MyResource.TX_BUTTON_MENU);
+                DrawTextUnderButton(Def.ButtonGlyph.ResumeContinue, MyResource.TX_BUTTON_CONTINUE);
             }
             if (phase == Def.Phase.MainSetup || phase == Def.Phase.PlaySetup)
             {
-                DrawTextRightButton(Def.ButtonGlygh.SetupSounds, MyResource.TX_BUTTON_SETUP_SOUNDS);
-                DrawTextRightButton(Def.ButtonGlygh.SetupJump, MyResource.TX_BUTTON_SETUP_JUMP);
-                DrawTextRightButton(Def.ButtonGlygh.SetupZoom, MyResource.TX_BUTTON_SETUP_ZOOM);
-                DrawTextRightButton(Def.ButtonGlygh.SetupAccel, MyResource.TX_BUTTON_SETUP_ACCEL);
+                DrawTextRightButton(Def.ButtonGlyph.SetupSounds, MyResource.TX_BUTTON_SETUP_SOUNDS);
+                DrawTextRightButton(Def.ButtonGlyph.SetupJump, MyResource.TX_BUTTON_SETUP_JUMP);
+                DrawTextRightButton(Def.ButtonGlyph.SetupZoom, MyResource.TX_BUTTON_SETUP_ZOOM);
+                DrawTextRightButton(Def.ButtonGlyph.SetupAccel, MyResource.TX_BUTTON_SETUP_ACCEL);
                 if (phase == Def.Phase.MainSetup)
                 {
                     string text = string.Format(MyResource.LoadString(MyResource.TX_BUTTON_SETUP_RESET), new string((char)(65 + gameData.SelectedGamer), 1));
-                    DrawTextRightButton(Def.ButtonGlygh.SetupReset, text);
+                    DrawTextRightButton(Def.ButtonGlyph.SetupReset, text);
                 }
             }
             if (phase == Def.Phase.Trial)
             {
-                TinyPoint tinyPoint = default(TinyPoint);
+                TinyPoint tinyPoint = default;
                 tinyPoint.X = 360;
                 tinyPoint.Y = 50;
                 TinyPoint pos = tinyPoint;
@@ -771,41 +770,41 @@ namespace WindowsPhoneSpeedyBlupi
                 Text.DrawText(pixmap, pos, MyResource.LoadString(MyResource.TX_TRIAL5), 0.7);
                 pos.Y += 25;
                 Text.DrawText(pixmap, pos, MyResource.LoadString(MyResource.TX_TRIAL6), 0.7);
-                DrawTextUnderButton(Def.ButtonGlygh.TrialBuy, MyResource.TX_BUTTON_BUY);
-                DrawTextUnderButton(Def.ButtonGlygh.TrialCancel, MyResource.TX_BUTTON_BACK);
+                DrawTextUnderButton(Def.ButtonGlyph.TrialBuy, MyResource.TX_BUTTON_BUY);
+                DrawTextUnderButton(Def.ButtonGlyph.TrialCancel, MyResource.TX_BUTTON_BACK);
             }
             if (phase == Def.Phase.Ranking)
             {
-                DrawTextUnderButton(Def.ButtonGlygh.RankingContinue, MyResource.TX_BUTTON_BACK);
+                DrawTextUnderButton(Def.ButtonGlyph.RankingContinue, MyResource.TX_BUTTON_BACK);
             }
         }
 
-        private void DrawButtonGamerText(Def.ButtonGlygh glyph, int gamer)
+        private void DrawButtonGamerText(Def.ButtonGlyph glyph, int gamer)
         {
             TinyRect buttonRect = inputPad.GetButtonRect(glyph);
             int nbVies;
             int mainDoors;
             int secondaryDoors;
             gameData.GetGamerInfo(gamer, out nbVies, out mainDoors, out secondaryDoors);
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = buttonRect.Right + 5 - pixmap.Origin.X;
             tinyPoint.Y = buttonRect.Top + 3 - pixmap.Origin.Y;
             TinyPoint pos = tinyPoint;
             string text = string.Format(MyResource.LoadString(MyResource.TX_GAMER_TITLE), new string((char)(65 + gamer), 1));
             Text.DrawText(pixmap, pos, text, 0.7);
-            TinyPoint tinyPoint2 = default(TinyPoint);
+            TinyPoint tinyPoint2 = default;
             tinyPoint2.X = buttonRect.Right + 5 - pixmap.Origin.X;
             tinyPoint2.Y = buttonRect.Top + 25 - pixmap.Origin.Y;
             pos = tinyPoint2;
             text = string.Format(MyResource.LoadString(MyResource.TX_GAMER_MDOORS), mainDoors);
             Text.DrawText(pixmap, pos, text, 0.45);
-            TinyPoint tinyPoint3 = default(TinyPoint);
+            TinyPoint tinyPoint3 = default;
             tinyPoint3.X = buttonRect.Right + 5 - pixmap.Origin.X;
             tinyPoint3.Y = buttonRect.Top + 39 - pixmap.Origin.Y;
             pos = tinyPoint3;
             text = string.Format(MyResource.LoadString(MyResource.TX_GAMER_SDOORS), secondaryDoors);
             Text.DrawText(pixmap, pos, text, 0.45);
-            TinyPoint tinyPoint4 = default(TinyPoint);
+            TinyPoint tinyPoint4 = default;
             tinyPoint4.X = buttonRect.Right + 5 - pixmap.Origin.X;
             tinyPoint4.Y = buttonRect.Top + 53 - pixmap.Origin.Y;
             pos = tinyPoint4;
@@ -813,18 +812,18 @@ namespace WindowsPhoneSpeedyBlupi
             Text.DrawText(pixmap, pos, text, 0.45);
         }
 
-        private void DrawTextRightButton(Def.ButtonGlygh glyph, int res)
+        private void DrawTextRightButton(Def.ButtonGlyph glyph, int res)
         {
             DrawTextRightButton(glyph, MyResource.LoadString(res));
         }
 
-        private void DrawTextRightButton(Def.ButtonGlygh glyph, string text)
+        private void DrawTextRightButton(Def.ButtonGlyph glyph, string text)
         {
             TinyRect buttonRect = inputPad.GetButtonRect(glyph);
             string[] array = text.Split('\n');
             if (array.Length == 2)
             {
-                TinyPoint tinyPoint = default(TinyPoint);
+                TinyPoint tinyPoint = default;
                 tinyPoint.X = buttonRect.Right + 10 - pixmap.Origin.X;
                 tinyPoint.Y = (buttonRect.Top + buttonRect.Bottom) / 2 - 20 - pixmap.Origin.Y;
                 TinyPoint pos = tinyPoint;
@@ -834,7 +833,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             else
             {
-                TinyPoint tinyPoint2 = default(TinyPoint);
+                TinyPoint tinyPoint2 = default;
                 tinyPoint2.X = buttonRect.Right + 10 - pixmap.Origin.X;
                 tinyPoint2.Y = (buttonRect.Top + buttonRect.Bottom) / 2 - 8 - pixmap.Origin.Y;
                 TinyPoint pos2 = tinyPoint2;
@@ -842,10 +841,10 @@ namespace WindowsPhoneSpeedyBlupi
             }
         }
 
-        private void DrawTextUnderButton(Def.ButtonGlygh glyph, int res)
+        private void DrawTextUnderButton(Def.ButtonGlyph glyph, int res)
         {
             TinyRect buttonRect = inputPad.GetButtonRect(glyph);
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = (buttonRect.Left + buttonRect.Right) / 2 - pixmap.Origin.X;
             tinyPoint.Y = buttonRect.Bottom + 2 - pixmap.Origin.Y;
             TinyPoint pos = tinyPoint;
@@ -872,7 +871,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private void DrawDebug()
         {
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = 10;
             tinyPoint.Y = 20;
             TinyPoint pos = tinyPoint;
@@ -972,9 +971,9 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void ToggleFullScreen()
         {
-            this.graphics.ToggleFullScreen();
+            graphics.ToggleFullScreen();
         }
-        public bool IsFullScreen() { return this.graphics.IsFullScreen; }
+        public bool IsFullScreen() { return graphics.IsFullScreen; }
 
         public GraphicsDeviceManager getGraphics()
         {
diff --git a/GameData.cs b/WindowsPhoneSpeedyBlupi/GameData.cs
similarity index 94%
rename from GameData.cs
rename to WindowsPhoneSpeedyBlupi/GameData.cs
index 2ee0dd2..637a112 100644
--- a/GameData.cs
+++ b/WindowsPhoneSpeedyBlupi/GameData.cs
@@ -1,7 +1,6 @@
 // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439
 // WindowsPhoneSpeedyBlupi.GameData
 using System;
-using WindowsPhoneSpeedyBlupi;
 
 namespace WindowsPhoneSpeedyBlupi
 {
@@ -84,7 +83,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             get
             {
-                return (double)(int)data[7] / 100.0;
+                return data[7] / 100.0;
             }
             set
             {
diff --git a/InputPad.cs b/WindowsPhoneSpeedyBlupi/InputPad.cs
similarity index 57%
rename from InputPad.cs
rename to WindowsPhoneSpeedyBlupi/InputPad.cs
index f6379a3..b9a0a1f 100644
--- a/InputPad.cs
+++ b/WindowsPhoneSpeedyBlupi/InputPad.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using Microsoft.Devices.Sensors;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Input.Touch;
-using WindowsPhoneSpeedyBlupi;
 using static WindowsPhoneSpeedyBlupi.Def;
 
 namespace WindowsPhoneSpeedyBlupi
@@ -26,7 +25,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private readonly GameData gameData;
 
-        private readonly List<Def.ButtonGlygh> pressedGlyphs;
+        private readonly List<ButtonGlyph> pressedGlyphs;
 
         private readonly Accelerometer accelSensor;
 
@@ -38,9 +37,9 @@ namespace WindowsPhoneSpeedyBlupi
 
         private TinyPoint padTouchPos;
 
-        private Def.ButtonGlygh lastButtonDown;
+        private ButtonGlyph lastButtonDown;
 
-        private Def.ButtonGlygh buttonPressed;
+        private ButtonGlyph buttonPressed;
 
         private int touchCount;
 
@@ -56,7 +55,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private int mission;
 
-        public Def.Phase Phase { get; set; }
+        public Phase Phase { get; set; }
 
         public int SelectedGamer { get; set; }
 
@@ -70,12 +69,12 @@ namespace WindowsPhoneSpeedyBlupi
             }
         }
 
-        public Def.ButtonGlygh ButtonPressed
+        public ButtonGlyph ButtonPressed
         {
             get
             {
-                Def.ButtonGlygh result = buttonPressed;
-                buttonPressed = Def.ButtonGlygh.None;
+                ButtonGlyph result = buttonPressed;
+                buttonPressed = ButtonGlyph.None;
                 return result;
             }
         }
@@ -92,97 +91,97 @@ namespace WindowsPhoneSpeedyBlupi
             }
         }
 
-        private IEnumerable<Def.ButtonGlygh> ButtonGlyphs
+        private IEnumerable<ButtonGlyph> ButtonGlyphs
         {
             get
             {
                 switch (Phase)
                 {
-                    case Def.Phase.Init:
-                        yield return Def.ButtonGlygh.InitGamerA;
-                        yield return Def.ButtonGlygh.InitGamerB;
-                        yield return Def.ButtonGlygh.InitGamerC;
-                        yield return Def.ButtonGlygh.InitSetup;
-                        yield return Def.ButtonGlygh.InitPlay;
+                    case Phase.Init:
+                        yield return ButtonGlyph.InitGamerA;
+                        yield return ButtonGlyph.InitGamerB;
+                        yield return ButtonGlyph.InitGamerC;
+                        yield return ButtonGlyph.InitSetup;
+                        yield return ButtonGlyph.InitPlay;
                         if (game1.IsTrialMode)
                         {
-                            yield return Def.ButtonGlygh.InitBuy;
+                            yield return ButtonGlyph.InitBuy;
                         }
                         if (game1.IsRankingMode)
                         {
-                            yield return Def.ButtonGlygh.InitRanking;
+                            yield return ButtonGlyph.InitRanking;
                         }
                         break;
-                    case Def.Phase.Play:
-                        yield return Def.ButtonGlygh.PlayPause;
-                        yield return Def.ButtonGlygh.PlayAction;
-                        yield return Def.ButtonGlygh.PlayJump;
+                    case Phase.Play:
+                        yield return ButtonGlyph.PlayPause;
+                        yield return ButtonGlyph.PlayAction;
+                        yield return ButtonGlyph.PlayJump;
                         if (accelStarted)
                         {
-                            yield return Def.ButtonGlygh.PlayDown;
+                            yield return ButtonGlyph.PlayDown;
                         }
-                        yield return Def.ButtonGlygh.Cheat11;
-                        yield return Def.ButtonGlygh.Cheat12;
-                        yield return Def.ButtonGlygh.Cheat21;
-                        yield return Def.ButtonGlygh.Cheat22;
-                        yield return Def.ButtonGlygh.Cheat31;
-                        yield return Def.ButtonGlygh.Cheat32;
+                        yield return ButtonGlyph.Cheat11;
+                        yield return ButtonGlyph.Cheat12;
+                        yield return ButtonGlyph.Cheat21;
+                        yield return ButtonGlyph.Cheat22;
+                        yield return ButtonGlyph.Cheat31;
+                        yield return ButtonGlyph.Cheat32;
                         break;
-                    case Def.Phase.Pause:
-                        yield return Def.ButtonGlygh.PauseMenu;
+                    case Phase.Pause:
+                        yield return ButtonGlyph.PauseMenu;
                         if (mission != 1)
                         {
-                            yield return Def.ButtonGlygh.PauseBack;
+                            yield return ButtonGlyph.PauseBack;
                         }
-                        yield return Def.ButtonGlygh.PauseSetup;
+                        yield return ButtonGlyph.PauseSetup;
                         if (mission != 1 && mission % 10 != 0)
                         {
-                            yield return Def.ButtonGlygh.PauseRestart;
+                            yield return ButtonGlyph.PauseRestart;
                         }
-                        yield return Def.ButtonGlygh.PauseContinue;
+                        yield return ButtonGlyph.PauseContinue;
                         break;
-                    case Def.Phase.Resume:
-                        yield return Def.ButtonGlygh.ResumeMenu;
-                        yield return Def.ButtonGlygh.ResumeContinue;
+                    case Phase.Resume:
+                        yield return ButtonGlyph.ResumeMenu;
+                        yield return ButtonGlyph.ResumeContinue;
                         break;
-                    case Def.Phase.Lost:
-                    case Def.Phase.Win:
-                        yield return Def.ButtonGlygh.WinLostReturn;
+                    case Phase.Lost:
+                    case Phase.Win:
+                        yield return ButtonGlyph.WinLostReturn;
                         break;
-                    case Def.Phase.Trial:
-                        yield return Def.ButtonGlygh.TrialBuy;
-                        yield return Def.ButtonGlygh.TrialCancel;
+                    case Phase.Trial:
+                        yield return ButtonGlyph.TrialBuy;
+                        yield return ButtonGlyph.TrialCancel;
                         break;
-                    case Def.Phase.MainSetup:
-                        yield return Def.ButtonGlygh.SetupSounds;
-                        yield return Def.ButtonGlygh.SetupJump;
-                        yield return Def.ButtonGlygh.SetupZoom;
-                        yield return Def.ButtonGlygh.SetupAccel;
-                        yield return Def.ButtonGlygh.SetupReset;
-                        yield return Def.ButtonGlygh.SetupReturn;
+                    case Phase.MainSetup:
+                        yield return ButtonGlyph.SetupSounds;
+                        yield return ButtonGlyph.SetupJump;
+                        yield return ButtonGlyph.SetupZoom;
+                        yield return ButtonGlyph.SetupAccel;
+                        yield return ButtonGlyph.SetupReset;
+                        yield return ButtonGlyph.SetupReturn;
                         break;
-                    case Def.Phase.PlaySetup:
-                        yield return Def.ButtonGlygh.SetupSounds;
-                        yield return Def.ButtonGlygh.SetupJump;
-                        yield return Def.ButtonGlygh.SetupZoom;
-                        yield return Def.ButtonGlygh.SetupAccel;
-                        yield return Def.ButtonGlygh.SetupReturn;
+                    case Phase.PlaySetup:
+                        yield return ButtonGlyph.SetupSounds;
+                        yield return ButtonGlyph.SetupJump;
+                        yield return ButtonGlyph.SetupZoom;
+                        yield return ButtonGlyph.SetupAccel;
+                        yield return ButtonGlyph.SetupReturn;
                         break;
-                    case Def.Phase.Ranking:
-                        yield return Def.ButtonGlygh.RankingContinue;
+                    case Phase.Ranking:
+                        yield return ButtonGlyph.RankingContinue;
                         break;
                 }
                 if (showCheatMenu)
                 {
-                    yield return Def.ButtonGlygh.Cheat1;
-                    yield return Def.ButtonGlygh.Cheat2;
-                    yield return Def.ButtonGlygh.Cheat3;
-                    yield return Def.ButtonGlygh.Cheat4;
-                    yield return Def.ButtonGlygh.Cheat5;
-                    yield return Def.ButtonGlygh.Cheat6;
-                    yield return Def.ButtonGlygh.Cheat7;
-                    yield return Def.ButtonGlygh.Cheat8;
-                    yield return Def.ButtonGlygh.Cheat9;
+                    yield return ButtonGlyph.Cheat1;
+                    yield return ButtonGlyph.Cheat2;
+                    yield return ButtonGlyph.Cheat3;
+                    yield return ButtonGlyph.Cheat4;
+                    yield return ButtonGlyph.Cheat5;
+                    yield return ButtonGlyph.Cheat6;
+                    yield return ButtonGlyph.Cheat7;
+                    yield return ButtonGlyph.Cheat8;
+                    yield return ButtonGlyph.Cheat9;
                 }
             }
         }
@@ -194,12 +193,12 @@ namespace WindowsPhoneSpeedyBlupi
                 TinyRect drawBounds = pixmap.DrawBounds;
                 if (gameData.JumpRight)
                 {
-                    TinyPoint result = default(TinyPoint);
+                    TinyPoint result = default;
                     result.X = 100;
                     result.Y = drawBounds.Height - 100;
                     return result;
                 }
-                TinyPoint result2 = default(TinyPoint);
+                TinyPoint result2 = default;
                 result2.X = drawBounds.Width - 100;
                 result2.Y = drawBounds.Height - 100;
                 return result2;
@@ -215,7 +214,7 @@ namespace WindowsPhoneSpeedyBlupi
             this.pixmap = pixmap;
             this.sound = sound;
             this.gameData = gameData;
-            pressedGlyphs = new List<Def.ButtonGlygh>();
+            pressedGlyphs = new List<ButtonGlyph>();
             accelSensor = new Accelerometer();
             ((SensorBase<AccelerometerReading>)(object)accelSensor).CurrentValueChanged += HandleAccelSensorCurrentValueChanged;
             accelSlider = new Slider
@@ -227,8 +226,8 @@ namespace WindowsPhoneSpeedyBlupi
                 },
                 Value = this.gameData.AccelSensitivity
             };
-            lastButtonDown = Def.ButtonGlygh.None;
-            buttonPressed = Def.ButtonGlygh.None;
+            lastButtonDown = ButtonGlyph.None;
+            buttonPressed = ButtonGlyph.None;
         }
 
         public void StartMission(int mission)
@@ -263,7 +262,7 @@ namespace WindowsPhoneSpeedyBlupi
             double verticalChange = 0.0;
             int num3 = 0;
             padPressed = false;
-            Def.ButtonGlygh buttonGlygh = Def.ButtonGlygh.None;
+            ButtonGlyph buttonGlyph = ButtonGlyph.None;
             TouchCollection touches = TouchPanel.GetState();
             touchCount = touches.Count;
             List<TinyPoint> touchesOrClicks = new List<TinyPoint>();
@@ -271,7 +270,7 @@ namespace WindowsPhoneSpeedyBlupi
             {
                 if (item.State == TouchLocationState.Pressed || item.State == TouchLocationState.Moved)
                 {
-                    TinyPoint tinyPoint = default(TinyPoint);
+                    TinyPoint tinyPoint = default;
                     tinyPoint.X = (int)item.Position.X;
                     tinyPoint.Y = (int)item.Position.Y;
                     touchesOrClicks.Add(tinyPoint);
@@ -287,12 +286,12 @@ namespace WindowsPhoneSpeedyBlupi
                 click.Y = mouseState.Y;
                 touchesOrClicks.Add(click);
             }
-            
+
             float screenWidth = game1.getGraphics().GraphicsDevice.Viewport.Width;
             float screenHeight = game1.getGraphics().GraphicsDevice.Viewport.Height;
             float screenRatio = screenWidth / screenHeight;
 
-            if (Def.PLATFORM == Platform.Android &&screenRatio > 1.3333333333333333)
+            if (PLATFORM == Platform.Android && screenRatio > 1.3333333333333333)
             {
                 for (int i = 0; i < touchesOrClicks.Count; i++)
                 {
@@ -306,29 +305,30 @@ namespace WindowsPhoneSpeedyBlupi
                     float widthHeightRatio = screenWidth / screenHeight;
                     float heightRatio = 480 / screenHeight;
                     float widthRatio = 640 / screenWidth;
-                    if(Def.DETAILED_DEBUGGING)
+                    if (DETAILED_DEBUGGING)
                     {
-                    Debug.WriteLine("-----");
-                    Debug.WriteLine("originalX=" + originalX);
-                    Debug.WriteLine("originalY=" + originalY);
-                    Debug.WriteLine("heightRatio=" + heightRatio);
-                    Debug.WriteLine("widthRatio=" + widthRatio);
-                    Debug.WriteLine("widthHeightRatio=" + widthHeightRatio);
+                        Debug.WriteLine("-----");
+                        Debug.WriteLine("originalX=" + originalX);
+                        Debug.WriteLine("originalY=" + originalY);
+                        Debug.WriteLine("heightRatio=" + heightRatio);
+                        Debug.WriteLine("widthRatio=" + widthRatio);
+                        Debug.WriteLine("widthHeightRatio=" + widthHeightRatio);
                     }
-                    if (screenHeight> 480) {
-                    touchOrClick.X = (int)(originalX * heightRatio);
-                    touchOrClick.Y = (int)(originalY * heightRatio);
-                    touchesOrClicks[i] = touchOrClick;
+                    if (screenHeight > 480)
+                    {
+                        touchOrClick.X = (int)(originalX * heightRatio);
+                        touchOrClick.Y = (int)(originalY * heightRatio);
+                        touchesOrClicks[i] = touchOrClick;
                     }
 
-                    if(Def.DETAILED_DEBUGGING) Debug.WriteLine("new X" + touchOrClick.X);
-                    if(Def.DETAILED_DEBUGGING) Debug.WriteLine("new Y" + touchOrClick.Y);
+                    if (DETAILED_DEBUGGING) Debug.WriteLine("new X" + touchOrClick.X);
+                    if (DETAILED_DEBUGGING) Debug.WriteLine("new Y" + touchOrClick.Y);
                 }
             }
 
             KeyboardState newState = Keyboard.GetState();
             {
-                if (newState.IsKeyDown(Keys.LeftControl)) touchesOrClicks.Add(createTinyPoint(-1, (int) KeyboardPress.LeftControl));
+                if (newState.IsKeyDown(Keys.LeftControl)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.LeftControl));
                 if (newState.IsKeyDown(Keys.Up)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Up));
                 if (newState.IsKeyDown(Keys.Right)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Right));
                 if (newState.IsKeyDown(Keys.Down)) touchesOrClicks.Add(createTinyPoint(-1, (int)KeyboardPress.Down));
@@ -337,17 +337,17 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (newState.IsKeyDown(Keys.F11))
             {
-                game1.ToggleFullScreen ();
+                game1.ToggleFullScreen();
                 Debug.WriteLine("F11 was pressed.");
             }
 
-            Boolean keyPressedUp = false;
-            Boolean keyPressedDown = false;
-            Boolean keyPressedLeft = false;
-            Boolean keyPressedRight = false;
+            bool keyPressedUp = false;
+            bool keyPressedDown = false;
+            bool keyPressedLeft = false;
+            bool keyPressedRight = false;
             foreach (TinyPoint touchOrClick in touchesOrClicks)
             {
-                Boolean keyboardPressed = false;
+                bool keyboardPressed = false;
                 if (touchOrClick.X == -1)
                 {
                     keyboardPressed = true;
@@ -370,97 +370,97 @@ namespace WindowsPhoneSpeedyBlupi
                         padPressed = true;
                     }
                     Debug.WriteLine("padPressed=" + padPressed);
-                    Def.ButtonGlygh buttonGlygh2 = ButtonDetect(tinyPoint2);
-                    Debug.WriteLine("buttonGlyph2 =" + buttonGlygh2);
-                    if (buttonGlygh2 != 0)
+                    ButtonGlyph buttonGlyph2 = ButtonDetect(tinyPoint2);
+                    Debug.WriteLine("buttonGlyph2 =" + buttonGlyph2);
+                    if (buttonGlyph2 != 0)
                     {
-                        pressedGlyphs.Add(buttonGlygh2);
+                        pressedGlyphs.Add(buttonGlyph2);
                     }
                     if (keyboardPressed)
                     {
                         switch (keyboardPress)
                         {
-                            case KeyboardPress.LeftControl: buttonGlygh2 = Def.ButtonGlygh.PlayJump; pressedGlyphs.Add(buttonGlygh2); break;
-                            case KeyboardPress.Space: buttonGlygh2 = Def.ButtonGlygh.PlayAction; pressedGlyphs.Add(buttonGlygh2); break;
+                            case KeyboardPress.LeftControl: buttonGlyph2 = ButtonGlyph.PlayJump; pressedGlyphs.Add(buttonGlyph2); break;
+                            case KeyboardPress.Space: buttonGlyph2 = ButtonGlyph.PlayAction; pressedGlyphs.Add(buttonGlyph2); break;
                         }
                     }
 
-                    if ((Phase == Def.Phase.MainSetup || Phase == Def.Phase.PlaySetup) && accelSlider.Move(tinyPoint2))
+                    if ((Phase == Phase.MainSetup || Phase == Phase.PlaySetup) && accelSlider.Move(tinyPoint2))
                     {
                         gameData.AccelSensitivity = accelSlider.Value;
                     }
-                    switch (buttonGlygh2)
+                    switch (buttonGlyph2)
                     {
-                        case Def.ButtonGlygh.PlayJump:
+                        case ButtonGlyph.PlayJump:
                             Debug.WriteLine("Jumping detected");
                             accelWaitZero = false;
                             num3 |= 1;
                             break;
-                        case Def.ButtonGlygh.PlayDown:
+                        case ButtonGlyph.PlayDown:
                             accelWaitZero = false;
                             num3 |= 4;
                             break;
-                        case Def.ButtonGlygh.InitGamerA:
-                        case Def.ButtonGlygh.InitGamerB:
-                        case Def.ButtonGlygh.InitGamerC:
-                        case Def.ButtonGlygh.InitSetup:
-                        case Def.ButtonGlygh.InitPlay:
-                        case Def.ButtonGlygh.InitBuy:
-                        case Def.ButtonGlygh.InitRanking:
-                        case Def.ButtonGlygh.WinLostReturn:
-                        case Def.ButtonGlygh.TrialBuy:
-                        case Def.ButtonGlygh.TrialCancel:
-                        case Def.ButtonGlygh.SetupSounds:
-                        case Def.ButtonGlygh.SetupJump:
-                        case Def.ButtonGlygh.SetupZoom:
-                        case Def.ButtonGlygh.SetupAccel:
-                        case Def.ButtonGlygh.SetupReset:
-                        case Def.ButtonGlygh.SetupReturn:
-                        case Def.ButtonGlygh.PauseMenu:
-                        case Def.ButtonGlygh.PauseBack:
-                        case Def.ButtonGlygh.PauseSetup:
-                        case Def.ButtonGlygh.PauseRestart:
-                        case Def.ButtonGlygh.PauseContinue:
-                        case Def.ButtonGlygh.PlayPause:
-                        case Def.ButtonGlygh.PlayAction:
-                        case Def.ButtonGlygh.ResumeMenu:
-                        case Def.ButtonGlygh.ResumeContinue:
-                        case Def.ButtonGlygh.RankingContinue:
-                        case Def.ButtonGlygh.Cheat11:
-                        case Def.ButtonGlygh.Cheat12:
-                        case Def.ButtonGlygh.Cheat21:
-                        case Def.ButtonGlygh.Cheat22:
-                        case Def.ButtonGlygh.Cheat31:
-                        case Def.ButtonGlygh.Cheat32:
-                        case Def.ButtonGlygh.Cheat1:
-                        case Def.ButtonGlygh.Cheat2:
-                        case Def.ButtonGlygh.Cheat3:
-                        case Def.ButtonGlygh.Cheat4:
-                        case Def.ButtonGlygh.Cheat5:
-                        case Def.ButtonGlygh.Cheat6:
-                        case Def.ButtonGlygh.Cheat7:
-                        case Def.ButtonGlygh.Cheat8:
-                        case Def.ButtonGlygh.Cheat9:
+                        case ButtonGlyph.InitGamerA:
+                        case ButtonGlyph.InitGamerB:
+                        case ButtonGlyph.InitGamerC:
+                        case ButtonGlyph.InitSetup:
+                        case ButtonGlyph.InitPlay:
+                        case ButtonGlyph.InitBuy:
+                        case ButtonGlyph.InitRanking:
+                        case ButtonGlyph.WinLostReturn:
+                        case ButtonGlyph.TrialBuy:
+                        case ButtonGlyph.TrialCancel:
+                        case ButtonGlyph.SetupSounds:
+                        case ButtonGlyph.SetupJump:
+                        case ButtonGlyph.SetupZoom:
+                        case ButtonGlyph.SetupAccel:
+                        case ButtonGlyph.SetupReset:
+                        case ButtonGlyph.SetupReturn:
+                        case ButtonGlyph.PauseMenu:
+                        case ButtonGlyph.PauseBack:
+                        case ButtonGlyph.PauseSetup:
+                        case ButtonGlyph.PauseRestart:
+                        case ButtonGlyph.PauseContinue:
+                        case ButtonGlyph.PlayPause:
+                        case ButtonGlyph.PlayAction:
+                        case ButtonGlyph.ResumeMenu:
+                        case ButtonGlyph.ResumeContinue:
+                        case ButtonGlyph.RankingContinue:
+                        case ButtonGlyph.Cheat11:
+                        case ButtonGlyph.Cheat12:
+                        case ButtonGlyph.Cheat21:
+                        case ButtonGlyph.Cheat22:
+                        case ButtonGlyph.Cheat31:
+                        case ButtonGlyph.Cheat32:
+                        case ButtonGlyph.Cheat1:
+                        case ButtonGlyph.Cheat2:
+                        case ButtonGlyph.Cheat3:
+                        case ButtonGlyph.Cheat4:
+                        case ButtonGlyph.Cheat5:
+                        case ButtonGlyph.Cheat6:
+                        case ButtonGlyph.Cheat7:
+                        case ButtonGlyph.Cheat8:
+                        case ButtonGlyph.Cheat9:
                             accelWaitZero = false;
-                            buttonGlygh = buttonGlygh2;
+                            buttonGlyph = buttonGlyph2;
                             showCheatMenu = false;
                             break;
                     }
                 }
             }
-            if (buttonGlygh != 0 && buttonGlygh != Def.ButtonGlygh.PlayAction && buttonGlygh != Def.ButtonGlygh.Cheat11 && buttonGlygh != Def.ButtonGlygh.Cheat12 && buttonGlygh != Def.ButtonGlygh.Cheat21 && buttonGlygh != Def.ButtonGlygh.Cheat22 && buttonGlygh != Def.ButtonGlygh.Cheat31 && buttonGlygh != Def.ButtonGlygh.Cheat32 && lastButtonDown == Def.ButtonGlygh.None)
+            if (buttonGlyph != 0 && buttonGlyph != ButtonGlyph.PlayAction && buttonGlyph != ButtonGlyph.Cheat11 && buttonGlyph != ButtonGlyph.Cheat12 && buttonGlyph != ButtonGlyph.Cheat21 && buttonGlyph != ButtonGlyph.Cheat22 && buttonGlyph != ButtonGlyph.Cheat31 && buttonGlyph != ButtonGlyph.Cheat32 && lastButtonDown == ButtonGlyph.None)
             {
-                TinyPoint tinyPoint3 = default(TinyPoint);
+                TinyPoint tinyPoint3 = default;
                 tinyPoint3.X = 320;
                 tinyPoint3.Y = 240;
                 TinyPoint pos = tinyPoint3;
                 sound.PlayImage(0, pos);
             }
-            if (buttonGlygh == Def.ButtonGlygh.None && lastButtonDown != 0)
+            if (buttonGlyph == ButtonGlyph.None && lastButtonDown != 0)
             {
                 buttonPressed = lastButtonDown;
             }
-            lastButtonDown = buttonGlygh;
+            lastButtonDown = buttonGlyph;
             if (padPressed)
             {
                 Debug.WriteLine("PadCenter.X=" + PadCenter.X);
@@ -479,19 +479,22 @@ namespace WindowsPhoneSpeedyBlupi
                         if (keyPressedLeft) padTouchPos.X = PadCenter.X - 30;
                         if (keyPressedRight) padTouchPos.X = PadCenter.X + 30;
                     }
-                    if (keyPressedDown) { 
+                    if (keyPressedDown)
+                    {
                         padTouchPos.Y = PadCenter.Y + 30;
                         padTouchPos.X = PadCenter.X;
                         if (keyPressedLeft) padTouchPos.X = PadCenter.X - 30;
                         if (keyPressedRight) padTouchPos.X = PadCenter.X + 30;
                     }
-                    if (keyPressedLeft) { 
+                    if (keyPressedLeft)
+                    {
                         padTouchPos.X = PadCenter.X - 30;
                         padTouchPos.Y = PadCenter.Y;
                         if (keyPressedUp) padTouchPos.Y = PadCenter.Y - 30;
                         if (keyPressedDown) padTouchPos.Y = PadCenter.Y + 30;
                     }
-                    if (keyPressedRight) { 
+                    if (keyPressedRight)
+                    {
                         padTouchPos.X = PadCenter.X + 30;
                         padTouchPos.Y = PadCenter.Y;
                         if (keyPressedUp) padTouchPos.Y = PadCenter.Y - 30;
@@ -539,12 +542,12 @@ namespace WindowsPhoneSpeedyBlupi
             decor.KeyChange(num3);
         }
 
-        private Def.ButtonGlygh ButtonDetect(TinyPoint pos)
+        private ButtonGlyph ButtonDetect(TinyPoint pos)
         {
-            foreach (Def.ButtonGlygh item in ButtonGlyphs.Reverse())
+            foreach (ButtonGlyph item in ButtonGlyphs.Reverse())
             {
                 int value = 0;
-                if (item == Def.ButtonGlygh.PlayJump || item == Def.ButtonGlygh.PlayAction || item == Def.ButtonGlygh.PlayDown || item == Def.ButtonGlygh.PlayPause)
+                if (item == ButtonGlyph.PlayJump || item == ButtonGlyph.PlayAction || item == ButtonGlyph.PlayDown || item == ButtonGlyph.PlayPause)
                 {
                     value = 20;
                 }
@@ -554,45 +557,45 @@ namespace WindowsPhoneSpeedyBlupi
                     return item;
                 }
             }
-            return Def.ButtonGlygh.None;
+            return ButtonGlyph.None;
         }
 
         public void Draw()
         {
-            if (!accelStarted && Phase == Def.Phase.Play)
+            if (!accelStarted && Phase == Phase.Play)
             {
                 pixmap.DrawIcon(14, 0, GetPadBounds(PadCenter, padSize / 2), 1.0, false);
-                TinyPoint center = (padPressed ? padTouchPos : PadCenter);
+                TinyPoint center = padPressed ? padTouchPos : PadCenter;
                 pixmap.DrawIcon(14, 1, GetPadBounds(center, padSize / 2), 1.0, false);
             }
-            foreach (Def.ButtonGlygh buttonGlyph in ButtonGlyphs)
+            foreach (ButtonGlyph buttonGlyph in ButtonGlyphs)
             {
                 bool pressed = pressedGlyphs.Contains(buttonGlyph);
                 bool selected = false;
-                if (buttonGlyph >= Def.ButtonGlygh.InitGamerA && buttonGlyph <= Def.ButtonGlygh.InitGamerC)
+                if (buttonGlyph >= ButtonGlyph.InitGamerA && buttonGlyph <= ButtonGlyph.InitGamerC)
                 {
                     int num = (int)(buttonGlyph - 1);
                     selected = num == gameData.SelectedGamer;
                 }
-                if (buttonGlyph == Def.ButtonGlygh.SetupSounds)
+                if (buttonGlyph == ButtonGlyph.SetupSounds)
                 {
                     selected = gameData.Sounds;
                 }
-                if (buttonGlyph == Def.ButtonGlygh.SetupJump)
+                if (buttonGlyph == ButtonGlyph.SetupJump)
                 {
                     selected = gameData.JumpRight;
                 }
-                if (buttonGlyph == Def.ButtonGlygh.SetupZoom)
+                if (buttonGlyph == ButtonGlyph.SetupZoom)
                 {
                     selected = gameData.AutoZoom;
                 }
-                if (buttonGlyph == Def.ButtonGlygh.SetupAccel)
+                if (buttonGlyph == ButtonGlyph.SetupAccel)
                 {
                     selected = gameData.AccelActive;
                 }
                 pixmap.DrawInputButton(GetButtonRect(buttonGlyph), buttonGlyph, pressed, selected);
             }
-            if ((Phase == Def.Phase.MainSetup || Phase == Def.Phase.PlaySetup) && gameData.AccelActive)
+            if ((Phase == Phase.MainSetup || Phase == Phase.PlaySetup) && gameData.AccelActive)
             {
                 accelSlider.Draw(pixmap);
             }
@@ -600,7 +603,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private TinyRect GetPadBounds(TinyPoint center, int radius)
         {
-            TinyRect result = default(TinyRect);
+            TinyRect result = default;
             result.Left = center.X - radius;
             result.Right = center.X + radius;
             result.Top = center.Y - radius;
@@ -608,7 +611,7 @@ namespace WindowsPhoneSpeedyBlupi
             return result;
         }
 
-        public TinyRect GetButtonRect(Def.ButtonGlygh glyph)
+        public TinyRect GetButtonRect(ButtonGlyph glyph)
         {
             TinyRect drawBounds = pixmap.DrawBounds;
             double num = drawBounds.Width;
@@ -616,10 +619,10 @@ namespace WindowsPhoneSpeedyBlupi
             double num3 = num2 / 5.0;
             double num4 = num2 * 140.0 / 480.0;
             double num5 = num2 / 3.5;
-            if (glyph >= Def.ButtonGlygh.Cheat1 && glyph <= Def.ButtonGlygh.Cheat9)
+            if (glyph >= ButtonGlyph.Cheat1 && glyph <= ButtonGlyph.Cheat9)
             {
                 int num6 = (int)(glyph - 35);
-                TinyRect result = default(TinyRect);
+                TinyRect result = default;
                 result.Left = 80 * num6;
                 result.Right = 80 * (num6 + 1);
                 result.Top = 0;
@@ -628,325 +631,325 @@ namespace WindowsPhoneSpeedyBlupi
             }
             switch (glyph)
             {
-                case Def.ButtonGlygh.InitGamerA:
+                case ButtonGlyph.InitGamerA:
                     {
-                        TinyRect result19 = default(TinyRect);
+                        TinyRect result19 = default;
                         result19.Left = (int)(20.0 + num4 * 0.0);
                         result19.Right = (int)(20.0 + num4 * 0.5);
                         result19.Top = (int)(num2 - 20.0 - num4 * 2.1);
                         result19.Bottom = (int)(num2 - 20.0 - num4 * 1.6);
                         return result19;
                     }
-                case Def.ButtonGlygh.InitGamerB:
+                case ButtonGlyph.InitGamerB:
                     {
-                        TinyRect result18 = default(TinyRect);
+                        TinyRect result18 = default;
                         result18.Left = (int)(20.0 + num4 * 0.0);
                         result18.Right = (int)(20.0 + num4 * 0.5);
                         result18.Top = (int)(num2 - 20.0 - num4 * 1.6);
                         result18.Bottom = (int)(num2 - 20.0 - num4 * 1.1);
                         return result18;
                     }
-                case Def.ButtonGlygh.InitGamerC:
+                case ButtonGlyph.InitGamerC:
                     {
-                        TinyRect result15 = default(TinyRect);
+                        TinyRect result15 = default;
                         result15.Left = (int)(20.0 + num4 * 0.0);
                         result15.Right = (int)(20.0 + num4 * 0.5);
                         result15.Top = (int)(num2 - 20.0 - num4 * 1.1);
                         result15.Bottom = (int)(num2 - 20.0 - num4 * 0.6);
                         return result15;
                     }
-                case Def.ButtonGlygh.InitSetup:
+                case ButtonGlyph.InitSetup:
                     {
-                        TinyRect result14 = default(TinyRect);
+                        TinyRect result14 = default;
                         result14.Left = (int)(20.0 + num4 * 0.0);
                         result14.Right = (int)(20.0 + num4 * 0.5);
                         result14.Top = (int)(num2 - 20.0 - num4 * 0.5);
                         result14.Bottom = (int)(num2 - 20.0 - num4 * 0.0);
                         return result14;
                     }
-                case Def.ButtonGlygh.InitPlay:
+                case ButtonGlyph.InitPlay:
                     {
-                        TinyRect result11 = default(TinyRect);
+                        TinyRect result11 = default;
                         result11.Left = (int)(num - 20.0 - num4 * 1.0);
                         result11.Right = (int)(num - 20.0 - num4 * 0.0);
                         result11.Top = (int)(num2 - 40.0 - num4 * 1.0);
                         result11.Bottom = (int)(num2 - 40.0 - num4 * 0.0);
                         return result11;
                     }
-                case Def.ButtonGlygh.InitBuy:
-                case Def.ButtonGlygh.InitRanking:
+                case ButtonGlyph.InitBuy:
+                case ButtonGlyph.InitRanking:
                     {
-                        TinyRect result10 = default(TinyRect);
+                        TinyRect result10 = default;
                         result10.Left = (int)(num - 20.0 - num4 * 0.75);
                         result10.Right = (int)(num - 20.0 - num4 * 0.25);
                         result10.Top = (int)(num2 - 20.0 - num4 * 2.1);
                         result10.Bottom = (int)(num2 - 20.0 - num4 * 1.6);
                         return result10;
                     }
-                case Def.ButtonGlygh.PauseMenu:
+                case ButtonGlyph.PauseMenu:
                     {
-                        TinyRect result37 = default(TinyRect);
-                        result37.Left = (int)((double)PixmapOrigin.X + num4 * -0.21);
-                        result37.Right = (int)((double)PixmapOrigin.X + num4 * 0.79);
-                        result37.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result37.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result37 = default;
+                        result37.Left = (int)(PixmapOrigin.X + num4 * -0.21);
+                        result37.Right = (int)(PixmapOrigin.X + num4 * 0.79);
+                        result37.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result37.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result37;
                     }
-                case Def.ButtonGlygh.PauseBack:
+                case ButtonGlyph.PauseBack:
                     {
-                        TinyRect result36 = default(TinyRect);
-                        result36.Left = (int)((double)PixmapOrigin.X + num4 * 0.79);
-                        result36.Right = (int)((double)PixmapOrigin.X + num4 * 1.79);
-                        result36.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result36.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result36 = default;
+                        result36.Left = (int)(PixmapOrigin.X + num4 * 0.79);
+                        result36.Right = (int)(PixmapOrigin.X + num4 * 1.79);
+                        result36.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result36.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result36;
                     }
-                case Def.ButtonGlygh.PauseSetup:
+                case ButtonGlyph.PauseSetup:
                     {
-                        TinyRect result35 = default(TinyRect);
-                        result35.Left = (int)((double)PixmapOrigin.X + num4 * 1.79);
-                        result35.Right = (int)((double)PixmapOrigin.X + num4 * 2.79);
-                        result35.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result35.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result35 = default;
+                        result35.Left = (int)(PixmapOrigin.X + num4 * 1.79);
+                        result35.Right = (int)(PixmapOrigin.X + num4 * 2.79);
+                        result35.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result35.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result35;
                     }
-                case Def.ButtonGlygh.PauseRestart:
+                case ButtonGlyph.PauseRestart:
                     {
-                        TinyRect result34 = default(TinyRect);
-                        result34.Left = (int)((double)PixmapOrigin.X + num4 * 2.79);
-                        result34.Right = (int)((double)PixmapOrigin.X + num4 * 3.79);
-                        result34.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result34.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result34 = default;
+                        result34.Left = (int)(PixmapOrigin.X + num4 * 2.79);
+                        result34.Right = (int)(PixmapOrigin.X + num4 * 3.79);
+                        result34.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result34.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result34;
                     }
-                case Def.ButtonGlygh.PauseContinue:
+                case ButtonGlyph.PauseContinue:
                     {
-                        TinyRect result33 = default(TinyRect);
-                        result33.Left = (int)((double)PixmapOrigin.X + num4 * 3.79);
-                        result33.Right = (int)((double)PixmapOrigin.X + num4 * 4.79);
-                        result33.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result33.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result33 = default;
+                        result33.Left = (int)(PixmapOrigin.X + num4 * 3.79);
+                        result33.Right = (int)(PixmapOrigin.X + num4 * 4.79);
+                        result33.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result33.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result33;
                     }
-                case Def.ButtonGlygh.ResumeMenu:
+                case ButtonGlyph.ResumeMenu:
                     {
-                        TinyRect result32 = default(TinyRect);
-                        result32.Left = (int)((double)PixmapOrigin.X + num4 * 1.29);
-                        result32.Right = (int)((double)PixmapOrigin.X + num4 * 2.29);
-                        result32.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result32.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result32 = default;
+                        result32.Left = (int)(PixmapOrigin.X + num4 * 1.29);
+                        result32.Right = (int)(PixmapOrigin.X + num4 * 2.29);
+                        result32.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result32.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result32;
                     }
-                case Def.ButtonGlygh.ResumeContinue:
+                case ButtonGlyph.ResumeContinue:
                     {
-                        TinyRect result31 = default(TinyRect);
-                        result31.Left = (int)((double)PixmapOrigin.X + num4 * 2.29);
-                        result31.Right = (int)((double)PixmapOrigin.X + num4 * 3.29);
-                        result31.Top = (int)((double)PixmapOrigin.Y + num4 * 2.2);
-                        result31.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.2);
+                        TinyRect result31 = default;
+                        result31.Left = (int)(PixmapOrigin.X + num4 * 2.29);
+                        result31.Right = (int)(PixmapOrigin.X + num4 * 3.29);
+                        result31.Top = (int)(PixmapOrigin.Y + num4 * 2.2);
+                        result31.Bottom = (int)(PixmapOrigin.Y + num4 * 3.2);
                         return result31;
                     }
-                case Def.ButtonGlygh.WinLostReturn:
+                case ButtonGlyph.WinLostReturn:
                     {
-                        TinyRect result30 = default(TinyRect);
-                        result30.Left = (int)((double)PixmapOrigin.X + num - num3 * 2.2);
-                        result30.Right = (int)((double)PixmapOrigin.X + num - num3 * 1.2);
-                        result30.Top = (int)((double)PixmapOrigin.Y + num3 * 0.2);
-                        result30.Bottom = (int)((double)PixmapOrigin.Y + num3 * 1.2);
+                        TinyRect result30 = default;
+                        result30.Left = (int)(PixmapOrigin.X + num - num3 * 2.2);
+                        result30.Right = (int)(PixmapOrigin.X + num - num3 * 1.2);
+                        result30.Top = (int)(PixmapOrigin.Y + num3 * 0.2);
+                        result30.Bottom = (int)(PixmapOrigin.Y + num3 * 1.2);
                         return result30;
                     }
-                case Def.ButtonGlygh.TrialBuy:
+                case ButtonGlyph.TrialBuy:
                     {
-                        TinyRect result29 = default(TinyRect);
-                        result29.Left = (int)((double)PixmapOrigin.X + num4 * 2.5);
-                        result29.Right = (int)((double)PixmapOrigin.X + num4 * 3.5);
-                        result29.Top = (int)((double)PixmapOrigin.Y + num4 * 2.1);
-                        result29.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.1);
+                        TinyRect result29 = default;
+                        result29.Left = (int)(PixmapOrigin.X + num4 * 2.5);
+                        result29.Right = (int)(PixmapOrigin.X + num4 * 3.5);
+                        result29.Top = (int)(PixmapOrigin.Y + num4 * 2.1);
+                        result29.Bottom = (int)(PixmapOrigin.Y + num4 * 3.1);
                         return result29;
                     }
-                case Def.ButtonGlygh.TrialCancel:
+                case ButtonGlyph.TrialCancel:
                     {
-                        TinyRect result28 = default(TinyRect);
-                        result28.Left = (int)((double)PixmapOrigin.X + num4 * 3.5);
-                        result28.Right = (int)((double)PixmapOrigin.X + num4 * 4.5);
-                        result28.Top = (int)((double)PixmapOrigin.Y + num4 * 2.1);
-                        result28.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.1);
+                        TinyRect result28 = default;
+                        result28.Left = (int)(PixmapOrigin.X + num4 * 3.5);
+                        result28.Right = (int)(PixmapOrigin.X + num4 * 4.5);
+                        result28.Top = (int)(PixmapOrigin.Y + num4 * 2.1);
+                        result28.Bottom = (int)(PixmapOrigin.Y + num4 * 3.1);
                         return result28;
                     }
-                case Def.ButtonGlygh.RankingContinue:
+                case ButtonGlyph.RankingContinue:
                     {
-                        TinyRect result27 = default(TinyRect);
-                        result27.Left = (int)((double)PixmapOrigin.X + num4 * 3.5);
-                        result27.Right = (int)((double)PixmapOrigin.X + num4 * 4.5);
-                        result27.Top = (int)((double)PixmapOrigin.Y + num4 * 2.1);
-                        result27.Bottom = (int)((double)PixmapOrigin.Y + num4 * 3.1);
+                        TinyRect result27 = default;
+                        result27.Left = (int)(PixmapOrigin.X + num4 * 3.5);
+                        result27.Right = (int)(PixmapOrigin.X + num4 * 4.5);
+                        result27.Top = (int)(PixmapOrigin.Y + num4 * 2.1);
+                        result27.Bottom = (int)(PixmapOrigin.Y + num4 * 3.1);
                         return result27;
                     }
-                case Def.ButtonGlygh.SetupSounds:
+                case ButtonGlyph.SetupSounds:
                     {
-                        TinyRect result26 = default(TinyRect);
+                        TinyRect result26 = default;
                         result26.Left = (int)(20.0 + num4 * 0.0);
                         result26.Right = (int)(20.0 + num4 * 0.5);
                         result26.Top = (int)(num2 - 20.0 - num4 * 2.0);
                         result26.Bottom = (int)(num2 - 20.0 - num4 * 1.5);
                         return result26;
                     }
-                case Def.ButtonGlygh.SetupJump:
+                case ButtonGlyph.SetupJump:
                     {
-                        TinyRect result25 = default(TinyRect);
+                        TinyRect result25 = default;
                         result25.Left = (int)(20.0 + num4 * 0.0);
                         result25.Right = (int)(20.0 + num4 * 0.5);
                         result25.Top = (int)(num2 - 20.0 - num4 * 1.5);
                         result25.Bottom = (int)(num2 - 20.0 - num4 * 1.0);
                         return result25;
                     }
-                case Def.ButtonGlygh.SetupZoom:
+                case ButtonGlyph.SetupZoom:
                     {
-                        TinyRect result24 = default(TinyRect);
+                        TinyRect result24 = default;
                         result24.Left = (int)(20.0 + num4 * 0.0);
                         result24.Right = (int)(20.0 + num4 * 0.5);
                         result24.Top = (int)(num2 - 20.0 - num4 * 1.0);
                         result24.Bottom = (int)(num2 - 20.0 - num4 * 0.5);
                         return result24;
                     }
-                case Def.ButtonGlygh.SetupAccel:
+                case ButtonGlyph.SetupAccel:
                     {
-                        TinyRect result23 = default(TinyRect);
+                        TinyRect result23 = default;
                         result23.Left = (int)(20.0 + num4 * 0.0);
                         result23.Right = (int)(20.0 + num4 * 0.5);
                         result23.Top = (int)(num2 - 20.0 - num4 * 0.5);
                         result23.Bottom = (int)(num2 - 20.0 - num4 * 0.0);
                         return result23;
                     }
-                case Def.ButtonGlygh.SetupReset:
+                case ButtonGlyph.SetupReset:
                     {
-                        TinyRect result22 = default(TinyRect);
+                        TinyRect result22 = default;
                         result22.Left = (int)(450.0 + num4 * 0.0);
                         result22.Right = (int)(450.0 + num4 * 0.5);
                         result22.Top = (int)(num2 - 20.0 - num4 * 2.0);
                         result22.Bottom = (int)(num2 - 20.0 - num4 * 1.5);
                         return result22;
                     }
-                case Def.ButtonGlygh.SetupReturn:
+                case ButtonGlyph.SetupReturn:
                     {
-                        TinyRect result21 = default(TinyRect);
+                        TinyRect result21 = default;
                         result21.Left = (int)(num - 20.0 - num4 * 0.8);
                         result21.Right = (int)(num - 20.0 - num4 * 0.0);
                         result21.Top = (int)(num2 - 20.0 - num4 * 0.8);
                         result21.Bottom = (int)(num2 - 20.0 - num4 * 0.0);
                         return result21;
                     }
-                case Def.ButtonGlygh.PlayPause:
+                case ButtonGlyph.PlayPause:
                     {
-                        TinyRect result20 = default(TinyRect);
+                        TinyRect result20 = default;
                         result20.Left = (int)(num - num3 * 0.7);
                         result20.Right = (int)(num - num3 * 0.2);
                         result20.Top = (int)(num3 * 0.2);
                         result20.Bottom = (int)(num3 * 0.7);
                         return result20;
                     }
-                case Def.ButtonGlygh.PlayAction:
+                case ButtonGlyph.PlayAction:
                     {
                         if (gameData.JumpRight)
                         {
-                            TinyRect result16 = default(TinyRect);
-                            result16.Left = (int)((double)drawBounds.Width - num3 * 1.2);
-                            result16.Right = (int)((double)drawBounds.Width - num3 * 0.2);
+                            TinyRect result16 = default;
+                            result16.Left = (int)(drawBounds.Width - num3 * 1.2);
+                            result16.Right = (int)(drawBounds.Width - num3 * 0.2);
                             result16.Top = (int)(num2 - num3 * 2.6);
                             result16.Bottom = (int)(num2 - num3 * 1.6);
                             return result16;
                         }
-                        TinyRect result17 = default(TinyRect);
+                        TinyRect result17 = default;
                         result17.Left = (int)(num3 * 0.2);
                         result17.Right = (int)(num3 * 1.2);
                         result17.Top = (int)(num2 - num3 * 2.6);
                         result17.Bottom = (int)(num2 - num3 * 1.6);
                         return result17;
                     }
-                case Def.ButtonGlygh.PlayJump:
+                case ButtonGlyph.PlayJump:
                     {
                         if (gameData.JumpRight)
                         {
-                            TinyRect result12 = default(TinyRect);
-                            result12.Left = (int)((double)drawBounds.Width - num3 * 1.2);
-                            result12.Right = (int)((double)drawBounds.Width - num3 * 0.2);
+                            TinyRect result12 = default;
+                            result12.Left = (int)(drawBounds.Width - num3 * 1.2);
+                            result12.Right = (int)(drawBounds.Width - num3 * 0.2);
                             result12.Top = (int)(num2 - num3 * 1.2);
                             result12.Bottom = (int)(num2 - num3 * 0.2);
                             return result12;
                         }
-                        TinyRect result13 = default(TinyRect);
+                        TinyRect result13 = default;
                         result13.Left = (int)(num3 * 0.2);
                         result13.Right = (int)(num3 * 1.2);
                         result13.Top = (int)(num2 - num3 * 1.2);
                         result13.Bottom = (int)(num2 - num3 * 0.2);
                         return result13;
                     }
-                case Def.ButtonGlygh.PlayDown:
+                case ButtonGlyph.PlayDown:
                     {
                         if (gameData.JumpRight)
                         {
-                            TinyRect result8 = default(TinyRect);
+                            TinyRect result8 = default;
                             result8.Left = (int)(num3 * 0.2);
                             result8.Right = (int)(num3 * 1.2);
                             result8.Top = (int)(num2 - num3 * 1.2);
                             result8.Bottom = (int)(num2 - num3 * 0.2);
                             return result8;
                         }
-                        TinyRect result9 = default(TinyRect);
-                        result9.Left = (int)((double)drawBounds.Width - num3 * 1.2);
-                        result9.Right = (int)((double)drawBounds.Width - num3 * 0.2);
+                        TinyRect result9 = default;
+                        result9.Left = (int)(drawBounds.Width - num3 * 1.2);
+                        result9.Right = (int)(drawBounds.Width - num3 * 0.2);
                         result9.Top = (int)(num2 - num3 * 1.2);
                         result9.Bottom = (int)(num2 - num3 * 0.2);
                         return result9;
                     }
-                case Def.ButtonGlygh.Cheat11:
+                case ButtonGlyph.Cheat11:
                     {
-                        TinyRect result7 = default(TinyRect);
+                        TinyRect result7 = default;
                         result7.Left = (int)(num5 * 0.0);
                         result7.Right = (int)(num5 * 1.0);
                         result7.Top = (int)(num5 * 0.0);
                         result7.Bottom = (int)(num5 * 1.0);
                         return result7;
                     }
-                case Def.ButtonGlygh.Cheat12:
+                case ButtonGlyph.Cheat12:
                     {
-                        TinyRect result6 = default(TinyRect);
+                        TinyRect result6 = default;
                         result6.Left = (int)(num5 * 0.0);
                         result6.Right = (int)(num5 * 1.0);
                         result6.Top = (int)(num5 * 1.0);
                         result6.Bottom = (int)(num5 * 2.0);
                         return result6;
                     }
-                case Def.ButtonGlygh.Cheat21:
+                case ButtonGlyph.Cheat21:
                     {
-                        TinyRect result5 = default(TinyRect);
+                        TinyRect result5 = default;
                         result5.Left = (int)(num5 * 1.0);
                         result5.Right = (int)(num5 * 2.0);
                         result5.Top = (int)(num5 * 0.0);
                         result5.Bottom = (int)(num5 * 1.0);
                         return result5;
                     }
-                case Def.ButtonGlygh.Cheat22:
+                case ButtonGlyph.Cheat22:
                     {
-                        TinyRect result4 = default(TinyRect);
+                        TinyRect result4 = default;
                         result4.Left = (int)(num5 * 1.0);
                         result4.Right = (int)(num5 * 2.0);
                         result4.Top = (int)(num5 * 1.0);
                         result4.Bottom = (int)(num5 * 2.0);
                         return result4;
                     }
-                case Def.ButtonGlygh.Cheat31:
+                case ButtonGlyph.Cheat31:
                     {
-                        TinyRect result3 = default(TinyRect);
+                        TinyRect result3 = default;
                         result3.Left = (int)(num5 * 2.0);
                         result3.Right = (int)(num5 * 3.0);
                         result3.Top = (int)(num5 * 0.0);
                         result3.Bottom = (int)(num5 * 1.0);
                         return result3;
                     }
-                case Def.ButtonGlygh.Cheat32:
+                case ButtonGlyph.Cheat32:
                     {
-                        TinyRect result2 = default(TinyRect);
+                        TinyRect result2 = default;
                         result2.Left = (int)(num5 * 2.0);
                         result2.Right = (int)(num5 * 3.0);
                         result2.Top = (int)(num5 * 1.0);
@@ -954,7 +957,7 @@ namespace WindowsPhoneSpeedyBlupi
                         return result2;
                     }
                 default:
-                    return default(TinyRect);
+                    return default;
             }
         }
 
@@ -997,9 +1000,9 @@ namespace WindowsPhoneSpeedyBlupi
             //IL_0006: Unknown result type (might be due to invalid IL or missing references)
 
             AccelerometerReading sensorReading = e.SensorReading;
-            float y = ((AccelerometerReading)(sensorReading)).Acceleration.Y;
+            float y = sensorReading.Acceleration.Y;
             float num = (1f - (float)gameData.AccelSensitivity) * 0.06f + 0.04f;
-            float num2 = (accelLastState ? (num * 0.6f) : num);
+            float num2 = accelLastState ? num * 0.6f : num;
             if (y > num2)
             {
                 accelSpeedX = 0.0 - Math.Min((double)y * 0.25 / (double)num + 0.25, 1.0);
diff --git a/Jauge.cs b/WindowsPhoneSpeedyBlupi/Jauge.cs
similarity index 93%
rename from Jauge.cs
rename to WindowsPhoneSpeedyBlupi/Jauge.cs
index 4ac9464..11165e4 100644
--- a/Jauge.cs
+++ b/WindowsPhoneSpeedyBlupi/Jauge.cs
@@ -1,7 +1,6 @@
 // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439
 // WindowsPhoneSpeedyBlupi.Jauge
 using Microsoft.Xna.Framework.Media;
-using WindowsPhoneSpeedyBlupi;
 
 namespace WindowsPhoneSpeedyBlupi
 {
@@ -65,7 +64,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void Draw()
         {
-            TinyRect rect = default(TinyRect);
+            TinyRect rect = default;
             if (m_bMinimizeRedraw && !m_bRedraw)
             {
                 return;
diff --git a/MarketPlace.cs b/WindowsPhoneSpeedyBlupi/MarketPlace.cs
similarity index 100%
rename from MarketPlace.cs
rename to WindowsPhoneSpeedyBlupi/MarketPlace.cs
diff --git a/Misc.cs b/WindowsPhoneSpeedyBlupi/Misc.cs
similarity index 81%
rename from Misc.cs
rename to WindowsPhoneSpeedyBlupi/Misc.cs
index 70a2625..cb619e1 100644
--- a/Misc.cs
+++ b/WindowsPhoneSpeedyBlupi/Misc.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Diagnostics;
 using Microsoft.Xna.Framework;
-using WindowsPhoneSpeedyBlupi;
 using static WindowsPhoneSpeedyBlupi.Def;
 
 
@@ -13,7 +12,7 @@ namespace WindowsPhoneSpeedyBlupi
     {
         public static Rectangle RotateAdjust(Rectangle rect, double angle)
         {
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = rect.Width / 2;
             tinyPoint.Y = rect.Height / 2;
             TinyPoint p = tinyPoint;
@@ -25,19 +24,19 @@ namespace WindowsPhoneSpeedyBlupi
 
         public static TinyPoint RotatePointRad(double angle, TinyPoint p)
         {
-            return RotatePointRad(default(TinyPoint), angle, p);
+            return RotatePointRad(default, angle, p);
         }
 
         public static TinyPoint RotatePointRad(TinyPoint center, double angle, TinyPoint p)
         {
-            TinyPoint tinyPoint = default(TinyPoint);
-            TinyPoint result = default(TinyPoint);
+            TinyPoint tinyPoint = default;
+            TinyPoint result = default;
             tinyPoint.X = p.X - center.X;
             tinyPoint.Y = p.Y - center.Y;
             double num = Math.Sin(angle);
             double num2 = Math.Cos(angle);
-            result.X = (int)((double)tinyPoint.X * num2 - (double)tinyPoint.Y * num);
-            result.Y = (int)((double)tinyPoint.X * num + (double)tinyPoint.Y * num2);
+            result.X = (int)(tinyPoint.X * num2 - tinyPoint.Y * num);
+            result.Y = (int)(tinyPoint.X * num + tinyPoint.Y * num2);
             result.X += center.X;
             result.Y += center.Y;
             return result;
@@ -65,18 +64,18 @@ namespace WindowsPhoneSpeedyBlupi
         {
             if (speed > 0.0)
             {
-                return Math.Max((int)(speed * (double)max), 1);
+                return Math.Max((int)(speed * max), 1);
             }
             if (speed < 0.0)
             {
-                return Math.Min((int)(speed * (double)max), -1);
+                return Math.Min((int)(speed * max), -1);
             }
             return 0;
         }
 
         public static TinyRect Inflate(TinyRect rect, int value)
         {
-            TinyRect result = default(TinyRect);
+            TinyRect result = default;
             result.Left = rect.Left - value;
             result.Right = rect.Right + value;
             result.Top = rect.Top - value;
@@ -95,7 +94,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         public static bool IntersectRect(out TinyRect dst, TinyRect src1, TinyRect src2)
         {
-            dst = default(TinyRect);
+            dst = default;
             dst.Left = Math.Max(src1.Left, src2.Left);
             dst.Right = Math.Min(src1.Right, src2.Right);
             dst.Top = Math.Max(src1.Top, src2.Top);
@@ -105,7 +104,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         public static bool UnionRect(out TinyRect dst, TinyRect src1, TinyRect src2)
         {
-            dst = default(TinyRect);
+            dst = default;
             dst.Left = Math.Min(src1.Left, src2.Left);
             dst.Right = Math.Max(src1.Right, src2.Right);
             dst.Top = Math.Min(src1.Top, src2.Top);
diff --git a/MyResource.cs b/WindowsPhoneSpeedyBlupi/MyResource.cs
similarity index 100%
rename from MyResource.cs
rename to WindowsPhoneSpeedyBlupi/MyResource.cs
diff --git a/Pixmap.cs b/WindowsPhoneSpeedyBlupi/Pixmap.cs
similarity index 79%
rename from Pixmap.cs
rename to WindowsPhoneSpeedyBlupi/Pixmap.cs
index c11d449..a036f9c 100644
--- a/Pixmap.cs
+++ b/WindowsPhoneSpeedyBlupi/Pixmap.cs
@@ -4,7 +4,6 @@ using System;
 using System.Diagnostics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using WindowsPhoneSpeedyBlupi;
 using static System.Net.Mime.MediaTypeNames;
 
 namespace WindowsPhoneSpeedyBlupi
@@ -63,10 +62,11 @@ namespace WindowsPhoneSpeedyBlupi
         {
             get
             {
-                TinyRect result = default(TinyRect);
+                TinyRect result = default;
                 double screenWidth = graphics.GraphicsDevice.Viewport.Width;
                 double screenHeight = graphics.GraphicsDevice.Viewport.Height;
-                if(Def.PLATFORM == Def.Platform.Android && screenHeight > 480) {
+                if (Def.PLATFORM == Def.Platform.Android && screenHeight > 480)
+                {
                     screenWidth = screenHeight * (640f / 480f);
                 }
                 if (screenWidth != 0.0 && screenHeight != 0.0)
@@ -96,7 +96,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             get
             {
-                TinyPoint result = default(TinyPoint);
+                TinyPoint result = default;
                 result.X = (int)originX;
                 result.Y = (int)originY;
                 return result;
@@ -113,9 +113,9 @@ namespace WindowsPhoneSpeedyBlupi
 
         public TinyPoint HotSpotToHud(TinyPoint pos)
         {
-            TinyPoint result = default(TinyPoint);
-            result.X = (int)((double)(pos.X - (int)hotSpotX) / hotSpotZoom) + (int)hotSpotX - (int)originX;
-            result.Y = (int)((double)(pos.Y - (int)hotSpotY) / hotSpotZoom) + (int)hotSpotY - (int)originY;
+            TinyPoint result = default;
+            result.X = (int)((pos.X - (int)hotSpotX) / hotSpotZoom) + (int)hotSpotX - (int)originX;
+            result.Y = (int)((pos.Y - (int)hotSpotY) / hotSpotZoom) + (int)hotSpotY - (int)originY;
             return result;
         }
 
@@ -126,102 +126,102 @@ namespace WindowsPhoneSpeedyBlupi
             hotSpotY = y;
         }
 
-        public void DrawInputButton(TinyRect rect, Def.ButtonGlygh glyph, bool pressed, bool selected)
+        public void DrawInputButton(TinyRect rect, Def.ButtonGlyph glyph, bool pressed, bool selected)
         {
             switch (glyph)
             {
-                case Def.ButtonGlygh.InitGamerA:
+                case Def.ButtonGlyph.InitGamerA:
                     DrawIcon(14, selected ? 16 : 4, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.InitGamerB:
+                case Def.ButtonGlyph.InitGamerB:
                     DrawIcon(14, selected ? 17 : 5, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.InitGamerC:
+                case Def.ButtonGlyph.InitGamerC:
                     DrawIcon(14, selected ? 18 : 6, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.InitSetup:
-                case Def.ButtonGlygh.PauseSetup:
+                case Def.ButtonGlyph.InitSetup:
+                case Def.ButtonGlyph.PauseSetup:
                     DrawIcon(14, 19, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.InitPlay:
+                case Def.ButtonGlyph.InitPlay:
                     DrawIcon(14, 7, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PauseMenu:
-                case Def.ButtonGlygh.ResumeMenu:
+                case Def.ButtonGlyph.PauseMenu:
+                case Def.ButtonGlyph.ResumeMenu:
                     DrawIcon(14, 11, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PauseBack:
+                case Def.ButtonGlyph.PauseBack:
                     DrawIcon(14, 8, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PauseRestart:
+                case Def.ButtonGlyph.PauseRestart:
                     DrawIcon(14, 9, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PauseContinue:
-                case Def.ButtonGlygh.ResumeContinue:
+                case Def.ButtonGlyph.PauseContinue:
+                case Def.ButtonGlyph.ResumeContinue:
                     DrawIcon(14, 10, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.WinLostReturn:
+                case Def.ButtonGlyph.WinLostReturn:
                     DrawIcon(14, 3, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.InitBuy:
-                case Def.ButtonGlygh.TrialBuy:
+                case Def.ButtonGlyph.InitBuy:
+                case Def.ButtonGlyph.TrialBuy:
                     DrawIcon(14, 22, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.InitRanking:
+                case Def.ButtonGlyph.InitRanking:
                     DrawIcon(14, 12, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.TrialCancel:
-                case Def.ButtonGlygh.RankingContinue:
+                case Def.ButtonGlyph.TrialCancel:
+                case Def.ButtonGlyph.RankingContinue:
                     DrawIcon(14, 8, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.SetupSounds:
-                case Def.ButtonGlygh.SetupJump:
-                case Def.ButtonGlygh.SetupZoom:
-                case Def.ButtonGlygh.SetupAccel:
+                case Def.ButtonGlyph.SetupSounds:
+                case Def.ButtonGlyph.SetupJump:
+                case Def.ButtonGlyph.SetupZoom:
+                case Def.ButtonGlyph.SetupAccel:
                     DrawIcon(14, selected ? 13 : 21, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.SetupReset:
+                case Def.ButtonGlyph.SetupReset:
                     DrawIcon(14, 20, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.SetupReturn:
+                case Def.ButtonGlyph.SetupReturn:
                     DrawIcon(14, 8, rect, pressed ? 0.8 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PlayJump:
+                case Def.ButtonGlyph.PlayJump:
                     DrawIcon(14, 2, rect, pressed ? 0.6 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PlayAction:
+                case Def.ButtonGlyph.PlayAction:
                     DrawIcon(14, 12, rect, pressed ? 0.6 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PlayDown:
+                case Def.ButtonGlyph.PlayDown:
                     DrawIcon(14, 23, rect, pressed ? 0.6 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.PlayPause:
+                case Def.ButtonGlyph.PlayPause:
                     DrawIcon(14, 3, rect, pressed ? 0.6 : 1.0, false);
                     break;
-                case Def.ButtonGlygh.Cheat1:
-                case Def.ButtonGlygh.Cheat2:
-                case Def.ButtonGlygh.Cheat3:
-                case Def.ButtonGlygh.Cheat4:
-                case Def.ButtonGlygh.Cheat5:
-                case Def.ButtonGlygh.Cheat6:
-                case Def.ButtonGlygh.Cheat7:
-                case Def.ButtonGlygh.Cheat8:
-                case Def.ButtonGlygh.Cheat9:
+                case Def.ButtonGlyph.Cheat1:
+                case Def.ButtonGlyph.Cheat2:
+                case Def.ButtonGlyph.Cheat3:
+                case Def.ButtonGlyph.Cheat4:
+                case Def.ButtonGlyph.Cheat5:
+                case Def.ButtonGlyph.Cheat6:
+                case Def.ButtonGlyph.Cheat7:
+                case Def.ButtonGlyph.Cheat8:
+                case Def.ButtonGlyph.Cheat9:
                     {
                         DrawIcon(14, 0, rect, pressed ? 0.6 : 1.0, false);
-                        TinyPoint tinyPoint = default(TinyPoint);
+                        TinyPoint tinyPoint = default;
                         tinyPoint.X = rect.Left + rect.Width / 2 - (int)originX;
                         tinyPoint.Y = rect.Top + 28;
                         TinyPoint pos = tinyPoint;
                         Text.DrawTextCenter(this, pos, Decor.GetCheatTinyText(glyph), 1.0);
                         break;
                     }
-                case Def.ButtonGlygh.Cheat11:
-                case Def.ButtonGlygh.Cheat12:
-                case Def.ButtonGlygh.Cheat21:
-                case Def.ButtonGlygh.Cheat22:
-                case Def.ButtonGlygh.Cheat31:
-                case Def.ButtonGlygh.Cheat32:
+                case Def.ButtonGlyph.Cheat11:
+                case Def.ButtonGlyph.Cheat12:
+                case Def.ButtonGlyph.Cheat21:
+                case Def.ButtonGlyph.Cheat22:
+                case Def.ButtonGlyph.Cheat31:
+                case Def.ButtonGlyph.Cheat32:
                     break;
             }
         }
@@ -289,11 +289,11 @@ namespace WindowsPhoneSpeedyBlupi
             spriteBatch.Begin(SpriteSortMode.BackToFront, BlendState.AlphaBlend);
             spriteBatch.Draw(bitmap, destinationRectangle, srcRectangle, Color.White);
             spriteBatch.End();
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = (int)originX;
             tinyPoint.Y = (int)originY;
             TinyPoint dest = tinyPoint;
-            TinyRect tinyRect = default(TinyRect);
+            TinyRect tinyRect = default;
             tinyRect.Left = 0;
             tinyRect.Top = 0;
             tinyRect.Right = 640;
@@ -304,9 +304,9 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void DrawChar(int rank, TinyPoint pos, double size)
         {
-            pos.X = (int)((double)pos.X + originX);
-            pos.Y = (int)((double)pos.Y + originY);
-            TinyRect tinyRect = default(TinyRect);
+            pos.X = (int)(pos.X + originX);
+            pos.Y = (int)(pos.Y + originY);
+            TinyRect tinyRect = default;
             tinyRect.Left = pos.X;
             tinyRect.Top = pos.Y;
             tinyRect.Right = pos.X + (int)(32.0 * size);
@@ -317,9 +317,9 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void HudIcon(int channel, int rank, TinyPoint pos)
         {
-            pos.X = (int)((double)pos.X + originX);
-            pos.Y = (int)((double)pos.Y + originY);
-            TinyRect tinyRect = default(TinyRect);
+            pos.X = (int)(pos.X + originX);
+            pos.Y = (int)(pos.Y + originY);
+            TinyRect tinyRect = default;
             tinyRect.Left = pos.X;
             tinyRect.Top = pos.Y;
             tinyRect.Right = pos.X;
@@ -330,7 +330,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void QuickIcon(int channel, int rank, TinyPoint pos)
         {
-            TinyRect tinyRect = default(TinyRect);
+            TinyRect tinyRect = default;
             tinyRect.Left = pos.X;
             tinyRect.Top = pos.Y;
             tinyRect.Right = pos.X;
@@ -341,7 +341,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void QuickIcon(int channel, int rank, TinyPoint pos, double opacity, double rotation)
         {
-            TinyRect tinyRect = default(TinyRect);
+            TinyRect tinyRect = default;
             tinyRect.Left = pos.X;
             tinyRect.Top = pos.Y;
             tinyRect.Right = pos.X;
@@ -364,11 +364,11 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (channel == 5)
             {
-                dest.X = (int)((double)dest.X + originX);
-                dest.Y = (int)((double)dest.Y + originY);
+                dest.X = (int)(dest.X + originX);
+                dest.Y = (int)(dest.Y + originY);
             }
             Rectangle value = new Rectangle(rect.Left, rect.Top, rect.Width, rect.Height);
-            Rectangle destinationRectangle = new Rectangle(dest.X, dest.Y, (int)((double)rect.Width * zoom), (int)((double)rect.Height * zoom));
+            Rectangle destinationRectangle = new Rectangle(dest.X, dest.Y, (int)(rect.Width * zoom), (int)(rect.Height * zoom));
             spriteBatch.Begin(SpriteSortMode.BackToFront, BlendState.AlphaBlend);
             spriteBatch.Draw(bitmap, destinationRectangle, value, Color.White);
             spriteBatch.End();
@@ -508,22 +508,22 @@ namespace WindowsPhoneSpeedyBlupi
 
         private Rectangle GetDstRectangle(TinyRect rect, int iconWidth, int iconHeight, bool useHotSpot)
         {
-            int num = ((rect.Width == 0) ? iconWidth : rect.Width);
-            int num2 = ((rect.Height == 0) ? iconHeight : rect.Height);
-            int num3 = (int)((double)rect.Left * zoom);
-            int num4 = (int)((double)rect.Top * zoom);
-            int num5 = (int)((double)num3 + (double)num * zoom);
-            int num6 = (int)((double)num4 + (double)num2 * zoom);
+            int num = rect.Width == 0 ? iconWidth : rect.Width;
+            int num2 = rect.Height == 0 ? iconHeight : rect.Height;
+            int num3 = (int)(rect.Left * zoom);
+            int num4 = (int)(rect.Top * zoom);
+            int num5 = (int)(num3 + num * zoom);
+            int num6 = (int)(num4 + num2 * zoom);
             if (useHotSpot && hotSpotZoom > 1.0)
             {
                 num3 -= (int)hotSpotX;
                 num4 -= (int)hotSpotY;
                 num5 -= (int)hotSpotX;
                 num6 -= (int)hotSpotY;
-                num3 = (int)((double)num3 * hotSpotZoom);
-                num4 = (int)((double)num4 * hotSpotZoom);
-                num5 = (int)((double)num5 * hotSpotZoom);
-                num6 = (int)((double)num6 * hotSpotZoom);
+                num3 = (int)(num3 * hotSpotZoom);
+                num4 = (int)(num4 * hotSpotZoom);
+                num5 = (int)(num5 * hotSpotZoom);
+                num6 = (int)(num6 * hotSpotZoom);
                 num3 += (int)hotSpotX;
                 num4 += (int)hotSpotY;
                 num5 += (int)hotSpotX;
diff --git a/Resource.cs b/WindowsPhoneSpeedyBlupi/Resource.cs
similarity index 90%
rename from Resource.cs
rename to WindowsPhoneSpeedyBlupi/Resource.cs
index c474ad2..86aebbf 100644
--- a/Resource.cs
+++ b/WindowsPhoneSpeedyBlupi/Resource.cs
@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Resources;
 using System.Runtime.CompilerServices;
-using WindowsPhoneSpeedyBlupi;
 
 //[DebuggerNonUserCode]
 //[GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
@@ -25,7 +24,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             get
             {
-                if (object.ReferenceEquals(resourceMan, null))
+                if (ReferenceEquals(resourceMan, null))
                 {
                     ResourceManager resourceManager = new ResourceManager("WindowsPhoneSpeedyBlupi.Resource", typeof(Resource).Assembly);
                     resourceMan = resourceManager;
diff --git a/Slider.cs b/WindowsPhoneSpeedyBlupi/Slider.cs
similarity index 81%
rename from Slider.cs
rename to WindowsPhoneSpeedyBlupi/Slider.cs
index a1838f7..c6cafb1 100644
--- a/Slider.cs
+++ b/WindowsPhoneSpeedyBlupi/Slider.cs
@@ -1,7 +1,6 @@
 // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439
 // WindowsPhoneSpeedyBlupi.Slider
 using System;
-using WindowsPhoneSpeedyBlupi;
 
 namespace WindowsPhoneSpeedyBlupi
 {
@@ -29,35 +28,35 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void Draw(Pixmap pixmap)
         {
-            TinyPoint tinyPoint = default(TinyPoint);
+            TinyPoint tinyPoint = default;
             tinyPoint.X = TopLeftCorner.X - pixmap.Origin.X;
             tinyPoint.Y = TopLeftCorner.Y - pixmap.Origin.Y;
             TinyPoint dest = tinyPoint;
-            TinyRect tinyRect = default(TinyRect);
+            TinyRect tinyRect = default;
             tinyRect.Left = 0;
             tinyRect.Right = 124;
             tinyRect.Top = 0;
             tinyRect.Bottom = 22;
             TinyRect rect = tinyRect;
             pixmap.DrawPart(5, dest, rect, 2.0);
-            int num = (int)((double)(PosRight - PosLeft) * Value);
+            int num = (int)((PosRight - PosLeft) * Value);
             int num2 = TopLeftCorner.Y + 22;
             int num3 = 94;
-            TinyRect tinyRect2 = default(TinyRect);
+            TinyRect tinyRect2 = default;
             tinyRect2.Left = PosLeft + num - num3 / 2;
             tinyRect2.Right = PosLeft + num + num3 / 2;
             tinyRect2.Top = num2 - num3 / 2;
             tinyRect2.Bottom = num2 + num3 / 2;
             rect = tinyRect2;
             pixmap.DrawIcon(14, 1, rect, 1.0, false);
-            TinyRect tinyRect3 = default(TinyRect);
+            TinyRect tinyRect3 = default;
             tinyRect3.Left = TopLeftCorner.X - 65;
             tinyRect3.Right = TopLeftCorner.X - 65 + 60;
             tinyRect3.Top = TopLeftCorner.Y - 10;
             tinyRect3.Bottom = TopLeftCorner.Y - 10 + 60;
             rect = tinyRect3;
             pixmap.DrawIcon(10, 37, rect, 1.0, false);
-            TinyRect tinyRect4 = default(TinyRect);
+            TinyRect tinyRect4 = default;
             tinyRect4.Left = TopLeftCorner.X + 248 + 5;
             tinyRect4.Right = TopLeftCorner.X + 248 + 5 + 60;
             tinyRect4.Top = TopLeftCorner.Y - 10;
@@ -68,7 +67,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         public bool Move(TinyPoint pos)
         {
-            TinyRect tinyRect = default(TinyRect);
+            TinyRect tinyRect = default;
             tinyRect.Left = TopLeftCorner.X - 50;
             tinyRect.Right = TopLeftCorner.X + 248 + 50;
             tinyRect.Top = TopLeftCorner.Y - 50;
@@ -76,7 +75,7 @@ namespace WindowsPhoneSpeedyBlupi
             TinyRect rect = tinyRect;
             if (Misc.IsInside(rect, pos))
             {
-                double val = ((double)pos.X - (double)PosLeft) / (double)(PosRight - PosLeft);
+                double val = (pos.X - (double)PosLeft) / (PosRight - PosLeft);
                 val = Math.Max(val, 0.0);
                 val = Math.Min(val, 1.0);
                 if (Value != val)
diff --git a/Sound.cs b/WindowsPhoneSpeedyBlupi/Sound.cs
similarity index 89%
rename from Sound.cs
rename to WindowsPhoneSpeedyBlupi/Sound.cs
index c583395..3b04400 100644
--- a/Sound.cs
+++ b/WindowsPhoneSpeedyBlupi/Sound.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework.Audio;
-using WindowsPhoneSpeedyBlupi;
 
 namespace WindowsPhoneSpeedyBlupi
 {
@@ -134,12 +133,12 @@ namespace WindowsPhoneSpeedyBlupi
 
         public void SetAudioVolume(int volume)
         {
-            this.volume = (double)volume / (double)MAXVOLUME;
+            this.volume = volume / (double)MAXVOLUME;
         }
 
         public int GetAudioVolume()
         {
-            return (int)(volume * (double)MAXVOLUME);
+            return (int)(volume * MAXVOLUME);
         }
 
         public void SetMidiVolume(int volume)
@@ -173,7 +172,7 @@ namespace WindowsPhoneSpeedyBlupi
             }
             if (channel >= 0 && channel < soundEffects.Count)
             {
-                if (channel != 10 && plays.Where((Play x) => x.Channel == channel && !x.IsFree).Any())
+                if (channel != 10 && plays.Where((x) => x.Channel == channel && !x.IsFree).Any())
                 {
                     return true;
                 }
@@ -226,24 +225,24 @@ namespace WindowsPhoneSpeedyBlupi
             double val = 1.0;
             if (pos.X < 0)
             {
-                val = 1.0 + (double)(pos.X / 640) * 2.0;
+                val = 1.0 + pos.X / 640 * 2.0;
             }
             if (pos.X > 640)
             {
                 pos.X -= 640;
-                val = 1.0 - (double)(pos.X / 640) * 2.0;
+                val = 1.0 - pos.X / 640 * 2.0;
             }
             val = Math.Max(val, 0.0);
             val = Math.Min(val, 1.0);
             double val2 = 1.0;
             if (pos.Y < 0)
             {
-                val2 = 1.0 + (double)(pos.Y / 480) * 3.0;
+                val2 = 1.0 + pos.Y / 480 * 3.0;
             }
             if (pos.Y > 480)
             {
                 pos.Y -= 480;
-                val2 = 1.0 - (double)(pos.Y / 480) * 3.0;
+                val2 = 1.0 - pos.Y / 480 * 3.0;
             }
             val2 = Math.Max(val2, 0.0);
             val2 = Math.Min(val2, 1.0);
@@ -252,7 +251,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private double GetBalance(TinyPoint pos)
         {
-            double val = (double)pos.X * 2.0 / 640.0 - 1.0;
+            double val = pos.X * 2.0 / 640.0 - 1.0;
             val = Math.Max(val, -1.0);
             return Math.Min(val, 1.0);
         }
diff --git a/Tables.cs b/WindowsPhoneSpeedyBlupi/Tables.cs
similarity index 97%
rename from Tables.cs
rename to WindowsPhoneSpeedyBlupi/Tables.cs
index dadc3ae..3b381be 100644
--- a/Tables.cs
+++ b/WindowsPhoneSpeedyBlupi/Tables.cs
@@ -1,7 +1,5 @@
 // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439
 // WindowsPhoneSpeedyBlupi.Tables
-using WindowsPhoneSpeedyBlupi;
-
 namespace WindowsPhoneSpeedyBlupi
 {
     public static class Tables
diff --git a/Text.cs b/WindowsPhoneSpeedyBlupi/Text.cs
similarity index 95%
rename from Text.cs
rename to WindowsPhoneSpeedyBlupi/Text.cs
index 2c14694..d34fafb 100644
--- a/Text.cs
+++ b/WindowsPhoneSpeedyBlupi/Text.cs
@@ -1,7 +1,5 @@
 // WindowsPhoneSpeedyBlupi, Version=1.0.0.5, Culture=neutral, PublicKeyToken=6db12cd62dbec439
 // WindowsPhoneSpeedyBlupi.Text
-using WindowsPhoneSpeedyBlupi;
-
 namespace WindowsPhoneSpeedyBlupi
 {
     public static class Text
@@ -226,7 +224,7 @@ namespace WindowsPhoneSpeedyBlupi
         {
             if (!string.IsNullOrEmpty(text))
             {
-                TinyPoint pos2 = default(TinyPoint);
+                TinyPoint pos2 = default;
                 pos2.X = pos.X - GetTextWidth(text, size) / 2;
                 pos2.Y = pos.Y;
                 DrawText(pixmap, pos2, text, size);
@@ -265,7 +263,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private static void DrawChar(Pixmap pixmap, ref TinyPoint pos, char car, double size)
         {
-            TinyPoint pos2 = default(TinyPoint);
+            TinyPoint pos2 = default;
             int num = (short)car * 6;
             int rank = table_char[num];
             pos2.X = pos.X + table_char[num + 1];
@@ -283,7 +281,7 @@ namespace WindowsPhoneSpeedyBlupi
 
         private static int GetCharWidth(char c, double size)
         {
-            return (int)((double)(table_width[table_char[(short)c * 6]] + 1) * size);
+            return (int)((table_width[table_char[(short)c * 6]] + 1) * size);
         }
 
         private static void DrawCharSingle(Pixmap pixmap, TinyPoint pos, int rank, double size)
diff --git a/TinyPoint.cs b/WindowsPhoneSpeedyBlupi/TinyPoint.cs
similarity index 100%
rename from TinyPoint.cs
rename to WindowsPhoneSpeedyBlupi/TinyPoint.cs
diff --git a/TinyRect.cs b/WindowsPhoneSpeedyBlupi/TinyRect.cs
similarity index 100%
rename from TinyRect.cs
rename to WindowsPhoneSpeedyBlupi/TinyRect.cs
diff --git a/Worlds.cs b/WindowsPhoneSpeedyBlupi/Worlds.cs
similarity index 94%
rename from Worlds.cs
rename to WindowsPhoneSpeedyBlupi/Worlds.cs
index c6d0cee..41dd23c 100644
--- a/Worlds.cs
+++ b/WindowsPhoneSpeedyBlupi/Worlds.cs
@@ -7,7 +7,6 @@ using System.IO;
 using System.IO.IsolatedStorage;
 using System.Text;
 using Microsoft.Xna.Framework;
-using WindowsPhoneSpeedyBlupi;
 
 namespace WindowsPhoneSpeedyBlupi
 {
@@ -275,38 +274,38 @@ namespace WindowsPhoneSpeedyBlupi
                     int num = text.IndexOf(name + "=");
                     if (num == -1)
                     {
-                        return default(TinyPoint);
+                        return default;
                     }
                     num += name.Length + 1;
                     int num2 = text.IndexOf(";", num);
                     if (num2 == -1)
                     {
-                        return default(TinyPoint);
+                        return default;
                     }
                     int num3 = text.IndexOf(" ", num);
                     if (num3 == -1)
                     {
-                        return default(TinyPoint);
+                        return default;
                     }
                     string s = text.Substring(num, num2 - num);
                     string s2 = text.Substring(num2 + 1, num3 - num2 - 1);
                     int result;
                     if (!int.TryParse(s, out result))
                     {
-                        return default(TinyPoint);
+                        return default;
                     }
                     int result2;
                     if (!int.TryParse(s2, out result2))
                     {
-                        return default(TinyPoint);
+                        return default;
                     }
-                    TinyPoint result3 = default(TinyPoint);
+                    TinyPoint result3 = default;
                     result3.X = result;
                     result3.Y = result2;
                     return result3;
                 }
             }
-            return default(TinyPoint);
+            return default;
         }
 
         public static int? GetDecorField(string[] lines, string section, int x, int y)