diff --git a/src/game/Game.java b/src/game/Game.java
index 86af5b5..9292b92 100644
--- a/src/game/Game.java
+++ b/src/game/Game.java
@@ -39,7 +39,7 @@
 	final static int WHITE = 3;
 	final static int BLUE = 4;
 	final static int COLORS = 5;
-	int NR_PLAYERS = 3;
+	int NR_PLAYERS = 2;
 	static int CARDS_PER_PLAYER;
 	final static int NR_OF_CARDS = 50;
 	static int CARDS_IN_DECK;
@@ -100,8 +100,8 @@
 	}
 	
 	private void init(){
-		font = new Font("Shanghai", Font.PLAIN, fontSize);
 		loadOptions();
+		font = new Font("Shanghai", Font.PLAIN, fontSize);
 		CARDS_PER_PLAYER = (NR_PLAYERS < 3) ? 5 : 4;
 		hints = MAX_HINTS;
 		thunders = 0;
@@ -205,6 +205,7 @@
 				JLabel tmp = new JLabel("Not set");
 				tmp.setBackground(Color.black);
 				tmp.setForeground(Color.white);
+				tmp.setFont(font);
 				deckUI[i][j] = tmp;
 				deckPanel.add(deckUI[i][j]);
 			}
@@ -217,6 +218,11 @@
 		nextMove = new JButton("Next");
 		placeCardButton = new JButton("Place");
 		trashCardButton = new JButton("Trash");
+		colorButton.setFont(font);
+		valueButton.setFont(font);
+		nextMove.setFont(font);
+		placeCardButton.setFont(font);
+		trashCardButton.setFont(font);
 		buttonPanel.add(colorButton);
 		buttonPanel.add(valueButton);
 		buttonPanel.add(nextMove);
@@ -233,6 +239,7 @@
 			tmp.setText("1");
 			tmp.setBackground(Color.white);
 			tmp.setName("Hint_" + i);
+			tmp.setFont(font);
 			hintPanel.add(tmp);
 			hintUI[i] = tmp;			
 		}
@@ -242,6 +249,7 @@
 			tmp.setText("0");
 			tmp.setBackground(Color.white);
 			tmp.setName("Thunder_" + i);
+			tmp.setFont(font);
 			thunderPanel.add(tmp);
 			thunderUI[i] = tmp;
 		}
@@ -355,7 +363,6 @@
 						deck[color][value-1] = c;
 						deckUI[color][value-1].setText(value + "");
 						deckUI[color][value-1].setForeground(c.getColor());
-						deckUI[color][value-1].setFont(font);
 						setWonOrLost();
 					} else { //card too high or too low
 						thunderUI[thunders++].setText("1");