diff --git a/.gitignore b/.gitignore
index 1b4d5e411..6caeaeada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ ipch/
 # Ignore compiled binaries
 *.o
 *.exe
-!tools/rREM/rrem.exe
 
 # Ignore all examples files
 examples/*
diff --git a/examples/Makefile b/examples/Makefile
index becb91dc4..d283e8077 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -25,7 +25,7 @@
 
 # Define required raylib variables
 PROJECT_NAME       ?= raylib_examples
-RAYLIB_VERSION     ?= 1.9.7
+RAYLIB_VERSION     ?= 2.0.0
 RAYLIB_API_VERSION ?= 1
 RAYLIB_PATH        ?= ..
 
@@ -207,7 +207,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
-        CFLAGS += $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows
+        CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
     endif
     ifeq ($(PLATFORM_OS),LINUX)
         ifeq ($(RAYLIB_BUILD_MODE),DEBUG)
diff --git a/release/libs/win32/mingw32/libraylib.a b/release/libs/win32/mingw32/libraylib.a
index b188e3298..3aac1c0cb 100644
Binary files a/release/libs/win32/mingw32/libraylib.a and b/release/libs/win32/mingw32/libraylib.a differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98b6b0e98..e6501dc50 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 project(raylib)
 include(GNUInstallDirs)
 
-set(PROJECT_VERSION 1.9.7)
+set(PROJECT_VERSION 2.0.0)
 set(API_VERSION 1)
 set(RAYLIB raylib)    # Name of the generated library
 
diff --git a/src/Makefile b/src/Makefile
index 8444ed577..67d7c8c28 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@
 .PHONY: all clean install uninstall
 
 # Define required raylib variables
-RAYLIB_VERSION     = 1.9.7
+RAYLIB_VERSION     = 2.0.0
 RAYLIB_API_VERSION = 1
 
 # See below for alternatives.
diff --git a/src/raylib.rc b/src/raylib.rc
index 89eb8e348..ee2a5fabf 100644
--- a/src/raylib.rc
+++ b/src/raylib.rc
@@ -1,22 +1,22 @@
 GLFW_ICON ICON "raylib.ico"
 
 1 VERSIONINFO
-FILEVERSION     1,8,0,0
-PRODUCTVERSION  1,8,0,0
+FILEVERSION     2,0,0,0
+PRODUCTVERSION  2,0,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
 	//BLOCK "080904E4" 	// English UK
     BLOCK "040904E4"	// English US
     BEGIN
-	  //VALUE "CompanyName", "My Company Name"
+	  VALUE "CompanyName", "raylib technologies"
       VALUE "FileDescription", "Created using raylib (www.raylib.com)"
-      VALUE "FileVersion", "1.8.0"
-      VALUE "InternalName", "raylib"
-      VALUE "LegalCopyright", "(c) 2017 Ramon Santamaria - @raysan5"
+      VALUE "FileVersion", "2.0.0"
+      VALUE "InternalName", "raylib app"
+      VALUE "LegalCopyright", "(c) 2018 Ramon Santamaria - @raysan5"
       //VALUE "OriginalFilename", "raylib_app.exe"
       VALUE "ProductName", "raylib game"
-      VALUE "ProductVersion", "1.8.0"
+      VALUE "ProductVersion", "2.0.0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/resources b/src/raylib_icon
similarity index 99%
rename from src/resources
rename to src/raylib_icon
index ca725042e..f6e32f371 100644
Binary files a/src/resources and b/src/raylib_icon differ
diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile
index a363e606d..181f9dfbf 100644
--- a/templates/advance_game/Makefile
+++ b/templates/advance_game/Makefile
@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
-        CFLAGS += $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows
+        CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
     endif
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -no-pie -D_DEFAULT_SOURCE
diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile
index 0de3082bb..4cd435ea4 100644
--- a/templates/simple_game/Makefile
+++ b/templates/simple_game/Makefile
@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
-        CFLAGS += $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows
+        CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
     endif
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -no-pie -D_DEFAULT_SOURCE
diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile
index 4ca1edd47..e18703b25 100644
--- a/templates/standard_game/Makefile
+++ b/templates/standard_game/Makefile
@@ -160,7 +160,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),WINDOWS)
         # resources file contains windows exe icon
         # -Wl,--subsystem,windows hides the console window
-        CFLAGS += $(RAYLIB_PATH)/src/resources -Wl,--subsystem,windows
+        CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows
     endif
     ifeq ($(PLATFORM_OS),LINUX)
         CFLAGS += -no-pie -D_DEFAULT_SOURCE