diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02fc502..367cc1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,8 @@ set(GCC_MINIMUM_VERSION "5.1")
 set(CLANG_MINIMUM_VERSION "3.5")
 
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
-set(VERSION_MAJOR 5)
-set(VERSION_MINOR 6)
+set(VERSION_MAJOR 1)
+set(VERSION_MINOR 1)
 set(VERSION_PATCH 1)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
diff --git a/src/constants.h b/src/constants.h
index b90af3e..20dda18 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -110,4 +110,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     GUI related things
 */
 
-#define TTF_DEFAULT_FONT_SIZE (26)
+#define TTF_DEFAULT_FONT_SIZE (32)
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 7aca766..932dd44 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -252,17 +252,22 @@ void set_default_settings()
 	// Effects
 	settings->setDefault("directional_colored_fog", "true");
 	settings->setDefault("inventory_items_animations", "false");
+# if ENABLE_GLES
 	settings->setDefault("mip_map", "false");
 	settings->setDefault("anisotropic_filter", "false");
+# else
+	settings->setDefault("mip_map", "true");
+	settings->setDefault("anisotropic_filter", "true");
+# endif
 	settings->setDefault("bilinear_filter", "false");
 	settings->setDefault("trilinear_filter", "false");
 	settings->setDefault("tone_mapping", "false");
-	settings->setDefault("enable_waving_water", "false");
+	settings->setDefault("enable_waving_water", "true");
 	settings->setDefault("water_wave_height", "1.0");
 	settings->setDefault("water_wave_length", "20.0");
 	settings->setDefault("water_wave_speed", "5.0");
-	settings->setDefault("enable_waving_leaves", "false");
-	settings->setDefault("enable_waving_plants", "false");
+	settings->setDefault("enable_waving_leaves", "true");
+	settings->setDefault("enable_waving_plants", "true");
 
 	// Effects Shadows
 	settings->setDefault("enable_dynamic_shadows", "false");
@@ -279,7 +284,7 @@ void set_default_settings()
 
 	// Input
 	settings->setDefault("invert_mouse", "false");
-	settings->setDefault("mouse_sensitivity", "0.05");
+	settings->setDefault("mouse_sensitivity", "0.08");
 	settings->setDefault("repeat_place_time", "0.25");
 	settings->setDefault("safe_dig_and_place", "false");
 	settings->setDefault("random_input", "false");