diff --git a/game/main.cpp b/game/main.cpp
index 5bf4769..5afb89a 100644
--- a/game/main.cpp
+++ b/game/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
           {"autorun", required_argument, 0, 'a'},
           {"port",    required_argument, 0, 'p'},
           {"sound",   no_argument,       0, 's'},
-          {"fps",     no_argument,       0, 'f'},
+          {"fullscreen",no_argument,     0, 'f'},
           {"dev",     no_argument,       0, 'd'},
           {0, 0, 0, 0}
         };
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
         switch (c)
         {
             case 'f':
-                SET_FLAG(SHOW_FPS,true);
+                SET_FLAG(FULLSCREEN,true);
                 break;
 
             case 'd':
@@ -100,8 +100,13 @@ int main(int argc, char *argv[])
     asio::io_service io_service;
     Server s(io_service, game.state(), atoi(port) );
 
-    //GameWindow window(500, 500, &game);
-    GameWindow window(500, 500, &game);
+    int x,y;
+    if(ISSET_FLAG(FULLSCREEN)){
+        x=1920,y=1080;
+    }else{
+        x=800,y=600;
+    }
+    GameWindow window(x, y, &game);
     window.set_maxfps(60.0);
     window.open();
 
diff --git a/game/options.hpp b/game/options.hpp
index f2271e1..a4b8452 100644
--- a/game/options.hpp
+++ b/game/options.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#define TEST_FLAG1   0
+#define FULLSCREEN   0
 #define SHOW_FPS     1
-#define TEST_FLAG2   2
 #define TEST_AUTORUN 3
 //...