diff --git a/PuzzlePlayer/PuzzlePlayer.cs b/PuzzlePlayer/PuzzlePlayer.cs
index add7f2315a518fcd8e8f59a8af0137f7f73df192..d4edde7ba0bc69c4babe8c3eb2816b63b4beb9e3 100644
--- a/PuzzlePlayer/PuzzlePlayer.cs
+++ b/PuzzlePlayer/PuzzlePlayer.cs
@@ -10,7 +10,7 @@ namespace PuzzlePlayer_Namespace
     {
         internal static void Main(string[] args)
         {
-            Application.Run(new PuzzleForm(new Minesweeper()));
+            Application.Run(new MainForm());
         }
     }
 
@@ -30,6 +30,7 @@ namespace PuzzlePlayer_Namespace
             puzzleForms.Add(new PuzzleForm(new Binary()));
             puzzleForms.Add(new PuzzleForm(new Maze()));
             puzzleForms.Add(new PuzzleForm(new Sudoku()));
+            puzzleForms.Add(new PuzzleForm(new Minesweeper()));
         }
 
         private void SetUpUI()
@@ -108,7 +109,7 @@ namespace PuzzlePlayer_Namespace
                     Width = 345,
                     Image = normalImage,
                     FlatStyle = FlatStyle.Flat,
-                    Font = new Font(UserDataManager.MainFont.Name, UserDataManager.MainFont.Size * 2),
+                    Font = new Font(UserDataManager.MainFont.Name, UserDataManager.MainFont.Size * 2,FontStyle.Bold),
                     Name = i.ToString()
                 };
 
@@ -164,15 +165,18 @@ namespace PuzzlePlayer_Namespace
 
         RoundedButton SetUpBlackJackButton()
         {
+            Image normalImage = SettingForm.GetEmbeddedImage("blackjackImg.jpg");
+            Image grayImage = SettingForm.GetEmbeddedImage("blackjackImgGray.jpg");
+
             RoundedButton blackJackButton = new RoundedButton();
             bj = new BlackJack();
             blackJackButton.Text = "BlackJack";
             blackJackButton.Margin = new Padding(10);
             blackJackButton.Height = 345;
             blackJackButton.Width = 345;
-            blackJackButton.Image = SettingForm.GetEmbeddedImage("bj.jpg");
+            blackJackButton.Image = normalImage;
             blackJackButton.FlatStyle = FlatStyle.Flat;
-            blackJackButton.Font = UserDataManager.MainFont;
+            blackJackButton.Font = new Font(UserDataManager.MainFont.Name, UserDataManager.MainFont.Size * 2,FontStyle.Bold);
             blackJackButton.Click += (object o, EventArgs e) => {
                 this.Hide();
 
@@ -192,6 +196,17 @@ namespace PuzzlePlayer_Namespace
                 bj.Show();
 
             };
+
+            blackJackButton.MouseEnter += (object o, EventArgs e) =>
+            {
+                blackJackButton.Image = grayImage;
+            };
+
+            blackJackButton.MouseLeave += (object o, EventArgs e) =>
+            {
+                blackJackButton.Image = normalImage;
+            };
+
             return blackJackButton;
         }
     }
diff --git a/PuzzlePlayer/PuzzlePlayer.csproj b/PuzzlePlayer/PuzzlePlayer.csproj
index 0756c671a7d944a1adac31e742d25b3041b1f580..88cac412d371659fbbb3b6d4fd4a7e92b55e1ac9 100644
--- a/PuzzlePlayer/PuzzlePlayer.csproj
+++ b/PuzzlePlayer/PuzzlePlayer.csproj
@@ -13,6 +13,8 @@
     <None Remove="Resources\Binary.jpg" />
     <None Remove="Resources\BinaryGray.jpg" />
     <None Remove="Resources\bj.jpg" />
+    <None Remove="Resources\blackjackImg.JPG" />
+    <None Remove="Resources\blackjackImgGray.jpg" />
     <None Remove="Resources\BlackJack\cards\10_of_clubs.png" />
     <None Remove="Resources\BlackJack\cards\10_of_diamonds.png" />
     <None Remove="Resources\BlackJack\cards\10_of_hearts.png" />
@@ -68,6 +70,8 @@
     <None Remove="Resources\BlackJack\cards\queen_of_spades.png" />
     <None Remove="Resources\Maze.jpg" />
     <None Remove="Resources\MazeGray.jpg" />
+    <None Remove="Resources\Minesweeper.jpg" />
+    <None Remove="Resources\MinesweeperGray.jpg" />
     <None Remove="Resources\Sudoku.jpg" />
     <None Remove="Resources\SudokuGray.jpg" />
     <None Remove="Resources\Themes.txt" />
@@ -77,6 +81,8 @@
     <EmbeddedResource Include="Resources\Binary.jpg" />
     <EmbeddedResource Include="Resources\BinaryGray.jpg" />
     <EmbeddedResource Include="Resources\bj.jpg" />
+    <EmbeddedResource Include="Resources\blackjackImg.jpg" />
+    <EmbeddedResource Include="Resources\blackjackImgGray.jpg" />
     <EmbeddedResource Include="Resources\BlackJack\cards\10_of_clubs.png" />
     <EmbeddedResource Include="Resources\BlackJack\cards\10_of_diamonds.png" />
     <EmbeddedResource Include="Resources\BlackJack\cards\10_of_hearts.png" />
@@ -132,6 +138,8 @@
     <EmbeddedResource Include="Resources\BlackJack\cards\queen_of_spades.png" />
     <EmbeddedResource Include="Resources\Maze.jpg" />
     <EmbeddedResource Include="Resources\MazeGray.jpg" />
+    <EmbeddedResource Include="Resources\Minesweeper.jpg" />
+    <EmbeddedResource Include="Resources\MinesweeperGray.jpg" />
     <EmbeddedResource Include="Resources\Sudoku.jpg" />
     <EmbeddedResource Include="Resources\SudokuGray.jpg" />
     <EmbeddedResource Include="Resources\Themes.txt" />
diff --git a/PuzzlePlayer/Resources/Minesweeper.jpg b/PuzzlePlayer/Resources/Minesweeper.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b7a0d59b0622b4c76e6738ae524691b937b9f478
Binary files /dev/null and b/PuzzlePlayer/Resources/Minesweeper.jpg differ
diff --git a/PuzzlePlayer/Resources/MinesweeperGray.jpg b/PuzzlePlayer/Resources/MinesweeperGray.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..87c5f8b5664ecab8f88adf24ecd61e3f87f189d1
Binary files /dev/null and b/PuzzlePlayer/Resources/MinesweeperGray.jpg differ
diff --git a/PuzzlePlayer/Resources/bj.jpg b/PuzzlePlayer/Resources/bj.jpg
deleted file mode 100644
index 239d07ecac80bb6837d05831baa106b571d72452..0000000000000000000000000000000000000000
Binary files a/PuzzlePlayer/Resources/bj.jpg and /dev/null differ
diff --git a/PuzzlePlayer/Resources/blackjackImg.jpg b/PuzzlePlayer/Resources/blackjackImg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..62ad27452fbb279128ebce56868b23d6f93b52be
Binary files /dev/null and b/PuzzlePlayer/Resources/blackjackImg.jpg differ
diff --git a/PuzzlePlayer/Resources/blackjackImgGray.jpg b/PuzzlePlayer/Resources/blackjackImgGray.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2749e2982b7c980888742d0e46df4418a5febeb2
Binary files /dev/null and b/PuzzlePlayer/Resources/blackjackImgGray.jpg differ