From 1b674f891e71acc2948ed4953fd586b4d1ba905f Mon Sep 17 00:00:00 2001
From: Joshua Moerman <lakseru@gmail.com>
Date: Mon, 31 Mar 2014 16:46:35 +0200
Subject: [PATCH] Renames the OSX supporting files and app names. Also fixes
 icon assets.

---
 GLEssentials.xcodeproj/project.pbxproj        |  70 +-
 .../Contents.json                             |   0
 .../AppIcon iOS.appiconset/Contents.json      |  53 ++
 .../Contents.json                             |   0
 ...sFullscreenWindow.h => FullscreenWindow.h} |   4 +-
 ...sFullscreenWindow.m => FullscreenWindow.m} |   6 +-
 .../OSX/GLEssentialsWindowController.h        |  16 -
 .../OSX/{GLEssentialsGLView.h => GLView.h}    |   4 +-
 .../OSX/{GLEssentialsGLView.m => GLView.m}    |  10 +-
 GLEssentials/OSX/MainMenu.xib                 | 686 +++---------------
 GLEssentials/OSX/WindowController.h           |  16 +
 ...sWindowController.m => WindowController.m} |  16 +-
 GLEssentials/OSX/main.m                       |   8 +
 GLEssentials/iOS/AppDelegate.h                |   2 +-
 GLEssentials/iOS/AppDelegate.m                |   2 +-
 GLEssentials/iOS/GLEssentials-Info.plist      |   4 +
 GLEssentials/iOS/ViewController.h             |   2 +-
 GLEssentials/iOS/ViewController.m             |   2 +-
 GLEssentials/iOS/main.m                       |   8 +
 19 files changed, 245 insertions(+), 664 deletions(-)
 rename GLEssentials/Images.xcassets/{AppIcon.appiconset => AppIcon OSX.appiconset}/Contents.json (100%)
 create mode 100644 GLEssentials/Images.xcassets/AppIcon iOS.appiconset/Contents.json
 rename GLEssentials/Images.xcassets/{LaunchImage.launchimage => LaunchImage iOS.launchimage}/Contents.json (100%)
 rename GLEssentials/OSX/{GLEssentialsFullscreenWindow.h => FullscreenWindow.h} (51%)
 rename GLEssentials/OSX/{GLEssentialsFullscreenWindow.m => FullscreenWindow.m} (91%)
 delete mode 100644 GLEssentials/OSX/GLEssentialsWindowController.h
 rename GLEssentials/OSX/{GLEssentialsGLView.h => GLView.h} (54%)
 rename GLEssentials/OSX/{GLEssentialsGLView.m => GLView.m} (96%)
 create mode 100644 GLEssentials/OSX/WindowController.h
 rename GLEssentials/OSX/{GLEssentialsWindowController.m => WindowController.m} (84%)

diff --git a/GLEssentials.xcodeproj/project.pbxproj b/GLEssentials.xcodeproj/project.pbxproj
index 448f7dc..0ac16b9 100644
--- a/GLEssentials.xcodeproj/project.pbxproj
+++ b/GLEssentials.xcodeproj/project.pbxproj
@@ -16,9 +16,9 @@
 		4280D43318E8321100E4CDFB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4280D41A18E8311400E4CDFB /* AppDelegate.m */; };
 		4280D43418E8321100E4CDFB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4280D42018E8311400E4CDFB /* ViewController.m */; };
 		4280D43818E839C100E4CDFB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4280D43718E839C100E4CDFB /* Images.xcassets */; };
-		4295A2CA18CB4E5100A58D8F /* GLEssentialsFullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C318CB4E5100A58D8F /* GLEssentialsFullscreenWindow.m */; };
-		4295A2CB18CB4E5100A58D8F /* GLEssentialsGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C518CB4E5100A58D8F /* GLEssentialsGLView.m */; };
-		4295A2CC18CB4E5100A58D8F /* GLEssentialsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C718CB4E5100A58D8F /* GLEssentialsWindowController.m */; };
+		4295A2CA18CB4E5100A58D8F /* FullscreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C318CB4E5100A58D8F /* FullscreenWindow.m */; };
+		4295A2CB18CB4E5100A58D8F /* GLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C518CB4E5100A58D8F /* GLView.m */; };
+		4295A2CC18CB4E5100A58D8F /* WindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2C718CB4E5100A58D8F /* WindowController.m */; };
 		4295A2E018CB68A400A58D8F /* Game.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2DF18CB68A400A58D8F /* Game.m */; };
 		4295A2EB18CBB0F700A58D8F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4295A2EA18CBB0F700A58D8F /* main.m */; };
 		4295A2F318CBB22800A58D8F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4295A2F218CBB22800A58D8F /* MainMenu.xib */; };
@@ -27,8 +27,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		3A1598D311B9DDB0001E7AB5 /* GLEssentials OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GLEssentials OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4280D3EA18E8307A00E4CDFB /* GLEssentials iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GLEssentials iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3A1598D311B9DDB0001E7AB5 /* GLEssentials.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GLEssentials.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		4280D3EA18E8307A00E4CDFB /* GLEssentials.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GLEssentials.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4280D3EC18E8307A00E4CDFB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		4280D3EE18E8307A00E4CDFB /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		4280D3F018E8307A00E4CDFB /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -44,12 +44,12 @@
 		4280D42818E831A900E4CDFB /* Fractal-iOS.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = "Fractal-iOS.fsh"; path = "GLEssentials/Fractal-iOS.fsh"; sourceTree = "<group>"; };
 		4280D42918E831A900E4CDFB /* Fractal-iOS.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = "Fractal-iOS.vsh"; path = "GLEssentials/Fractal-iOS.vsh"; sourceTree = "<group>"; };
 		4280D43718E839C100E4CDFB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = GLEssentials/Images.xcassets; sourceTree = "<group>"; };
-		4295A2C218CB4E5100A58D8F /* GLEssentialsFullscreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLEssentialsFullscreenWindow.h; path = GLEssentials/OSX/GLEssentialsFullscreenWindow.h; sourceTree = "<group>"; };
-		4295A2C318CB4E5100A58D8F /* GLEssentialsFullscreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GLEssentialsFullscreenWindow.m; path = GLEssentials/OSX/GLEssentialsFullscreenWindow.m; sourceTree = "<group>"; };
-		4295A2C418CB4E5100A58D8F /* GLEssentialsGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLEssentialsGLView.h; path = GLEssentials/OSX/GLEssentialsGLView.h; sourceTree = "<group>"; };
-		4295A2C518CB4E5100A58D8F /* GLEssentialsGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GLEssentialsGLView.m; path = GLEssentials/OSX/GLEssentialsGLView.m; sourceTree = "<group>"; };
-		4295A2C618CB4E5100A58D8F /* GLEssentialsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLEssentialsWindowController.h; path = GLEssentials/OSX/GLEssentialsWindowController.h; sourceTree = "<group>"; };
-		4295A2C718CB4E5100A58D8F /* GLEssentialsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GLEssentialsWindowController.m; path = GLEssentials/OSX/GLEssentialsWindowController.m; sourceTree = "<group>"; };
+		4295A2C218CB4E5100A58D8F /* FullscreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FullscreenWindow.h; path = GLEssentials/OSX/FullscreenWindow.h; sourceTree = "<group>"; };
+		4295A2C318CB4E5100A58D8F /* FullscreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FullscreenWindow.m; path = GLEssentials/OSX/FullscreenWindow.m; sourceTree = "<group>"; };
+		4295A2C418CB4E5100A58D8F /* GLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GLView.h; path = GLEssentials/OSX/GLView.h; sourceTree = "<group>"; };
+		4295A2C518CB4E5100A58D8F /* GLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GLView.m; path = GLEssentials/OSX/GLView.m; sourceTree = "<group>"; };
+		4295A2C618CB4E5100A58D8F /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowController.h; path = GLEssentials/OSX/WindowController.h; sourceTree = "<group>"; };
+		4295A2C718CB4E5100A58D8F /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WindowController.m; path = GLEssentials/OSX/WindowController.m; sourceTree = "<group>"; };
 		4295A2DE18CB68A400A58D8F /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Game.h; path = GLEssentials/Game.h; sourceTree = "<group>"; };
 		4295A2DF18CB68A400A58D8F /* Game.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Game.m; path = GLEssentials/Game.m; sourceTree = "<group>"; };
 		4295A2EA18CBB0F700A58D8F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = GLEssentials/OSX/main.m; sourceTree = "<group>"; };
@@ -94,8 +94,8 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				3A1598D311B9DDB0001E7AB5 /* GLEssentials OSX.app */,
-				4280D3EA18E8307A00E4CDFB /* GLEssentials iOS.app */,
+				3A1598D311B9DDB0001E7AB5 /* GLEssentials.app */,
+				4280D3EA18E8307A00E4CDFB /* GLEssentials.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -153,12 +153,12 @@
 				4295A2F018CBB1D200A58D8F /* GLEssentials-Info.plist */,
 				4295A2EA18CBB0F700A58D8F /* main.m */,
 				4295A2F218CBB22800A58D8F /* MainMenu.xib */,
-				4295A2C218CB4E5100A58D8F /* GLEssentialsFullscreenWindow.h */,
-				4295A2C318CB4E5100A58D8F /* GLEssentialsFullscreenWindow.m */,
-				4295A2C418CB4E5100A58D8F /* GLEssentialsGLView.h */,
-				4295A2C518CB4E5100A58D8F /* GLEssentialsGLView.m */,
-				4295A2C618CB4E5100A58D8F /* GLEssentialsWindowController.h */,
-				4295A2C718CB4E5100A58D8F /* GLEssentialsWindowController.m */,
+				4295A2C218CB4E5100A58D8F /* FullscreenWindow.h */,
+				4295A2C318CB4E5100A58D8F /* FullscreenWindow.m */,
+				4295A2C418CB4E5100A58D8F /* GLView.h */,
+				4295A2C518CB4E5100A58D8F /* GLView.m */,
+				4295A2C618CB4E5100A58D8F /* WindowController.h */,
+				4295A2C718CB4E5100A58D8F /* WindowController.m */,
 			);
 			name = OSX;
 			sourceTree = "<group>";
@@ -180,7 +180,7 @@
 			);
 			name = iOS;
 			productName = "GLEssentials iOS";
-			productReference = 4280D3EA18E8307A00E4CDFB /* GLEssentials iOS.app */;
+			productReference = 4280D3EA18E8307A00E4CDFB /* GLEssentials.app */;
 			productType = "com.apple.product-type.application";
 		};
 		8D1107260486CEB800E47090 /* OSX */ = {
@@ -198,7 +198,7 @@
 			name = OSX;
 			productInstallPath = "$(HOME)/Applications";
 			productName = OSXGLEssentials;
-			productReference = 3A1598D311B9DDB0001E7AB5 /* GLEssentials OSX.app */;
+			productReference = 3A1598D311B9DDB0001E7AB5 /* GLEssentials.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -272,9 +272,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				4295A2EB18CBB0F700A58D8F /* main.m in Sources */,
-				4295A2CA18CB4E5100A58D8F /* GLEssentialsFullscreenWindow.m in Sources */,
-				4295A2CB18CB4E5100A58D8F /* GLEssentialsGLView.m in Sources */,
-				4295A2CC18CB4E5100A58D8F /* GLEssentialsWindowController.m in Sources */,
+				4295A2CA18CB4E5100A58D8F /* FullscreenWindow.m in Sources */,
+				4295A2CB18CB4E5100A58D8F /* GLView.m in Sources */,
+				4295A2CC18CB4E5100A58D8F /* WindowController.m in Sources */,
 				4295A2E018CB68A400A58D8F /* Game.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -286,8 +286,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2";
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -302,7 +302,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/GLEssentials/iOS/GLEssentials-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = GLEssentials;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -312,8 +312,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2";
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -323,7 +323,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = ESSENTIAL_GL_PRACTICES_IOS;
 				INFOPLIST_FILE = "$(SRCROOT)/GLEssentials/iOS/GLEssentials-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = GLEssentials;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -334,13 +334,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon OSX";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = "$(SRCROOT)/GLEssentials/OSX/GLEssentials-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = "GLEssentials OSX";
+				PRODUCT_NAME = GLEssentials;
 			};
 			name = Debug;
 		};
@@ -348,13 +347,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon OSX";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = "$(SRCROOT)/GLEssentials/OSX/GLEssentials-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = "GLEssentials OSX";
+				PRODUCT_NAME = GLEssentials;
 			};
 			name = Release;
 		};
diff --git a/GLEssentials/Images.xcassets/AppIcon.appiconset/Contents.json b/GLEssentials/Images.xcassets/AppIcon OSX.appiconset/Contents.json
similarity index 100%
rename from GLEssentials/Images.xcassets/AppIcon.appiconset/Contents.json
rename to GLEssentials/Images.xcassets/AppIcon OSX.appiconset/Contents.json
diff --git a/GLEssentials/Images.xcassets/AppIcon iOS.appiconset/Contents.json b/GLEssentials/Images.xcassets/AppIcon iOS.appiconset/Contents.json
new file mode 100644
index 0000000..282551e
--- /dev/null
+++ b/GLEssentials/Images.xcassets/AppIcon iOS.appiconset/Contents.json	
@@ -0,0 +1,53 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/GLEssentials/Images.xcassets/LaunchImage.launchimage/Contents.json b/GLEssentials/Images.xcassets/LaunchImage iOS.launchimage/Contents.json
similarity index 100%
rename from GLEssentials/Images.xcassets/LaunchImage.launchimage/Contents.json
rename to GLEssentials/Images.xcassets/LaunchImage iOS.launchimage/Contents.json
diff --git a/GLEssentials/OSX/GLEssentialsFullscreenWindow.h b/GLEssentials/OSX/FullscreenWindow.h
similarity index 51%
rename from GLEssentials/OSX/GLEssentialsFullscreenWindow.h
rename to GLEssentials/OSX/FullscreenWindow.h
index 7b06af0..4c52a78 100644
--- a/GLEssentials/OSX/GLEssentialsFullscreenWindow.h
+++ b/GLEssentials/OSX/FullscreenWindow.h
@@ -1,6 +1,6 @@
 //
 //
-//  iOSGLEssentials
+//  OSX GLEssentials
 //
 //  Copied from the Apple GLEssentials
 //
@@ -8,5 +8,5 @@
 
 @import Cocoa;
 
-@interface GLEssentialsFullscreenWindow : NSWindow
+@interface FullscreenWindow : NSWindow
 @end
diff --git a/GLEssentials/OSX/GLEssentialsFullscreenWindow.m b/GLEssentials/OSX/FullscreenWindow.m
similarity index 91%
rename from GLEssentials/OSX/GLEssentialsFullscreenWindow.m
rename to GLEssentials/OSX/FullscreenWindow.m
index a1e5f79..25807e3 100644
--- a/GLEssentials/OSX/GLEssentialsFullscreenWindow.m
+++ b/GLEssentials/OSX/FullscreenWindow.m
@@ -1,14 +1,14 @@
 //
 //
-//  iOSGLEssentials
+//  OSX GLEssentials
 //
 //  Copied from the Apple GLEssentials
 //
 //
 
-#import "GLEssentialsFullscreenWindow.h"
+#import "FullscreenWindow.h"
 
-@implementation GLEssentialsFullscreenWindow
+@implementation FullscreenWindow
 
 - (id)init {
 	// Create a screen-sized window on the display you want to take over
diff --git a/GLEssentials/OSX/GLEssentialsWindowController.h b/GLEssentials/OSX/GLEssentialsWindowController.h
deleted file mode 100644
index 00ca30c..0000000
--- a/GLEssentials/OSX/GLEssentialsWindowController.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//
-//  iOSGLEssentials
-//
-//  Copied from the Apple GLEssentials
-//
-//
-
-@import Cocoa;
-
-@class GLEssentialsGLView;
-@interface GLEssentialsWindowController : NSWindowController {
-	IBOutlet GLEssentialsGLView *view;
-}
-
-@end
diff --git a/GLEssentials/OSX/GLEssentialsGLView.h b/GLEssentials/OSX/GLView.h
similarity index 54%
rename from GLEssentials/OSX/GLEssentialsGLView.h
rename to GLEssentials/OSX/GLView.h
index 9a72cc5..0731f63 100644
--- a/GLEssentials/OSX/GLEssentialsGLView.h
+++ b/GLEssentials/OSX/GLView.h
@@ -1,6 +1,6 @@
 //
 //
-//  iOSGLEssentials
+//  OSX GLEssentials
 //
 //  Copied from the Apple GLEssentials
 //
@@ -8,5 +8,5 @@
 
 @import AppKit;
 
-@interface GLEssentialsGLView : NSOpenGLView
+@interface GLView : NSOpenGLView
 @end
diff --git a/GLEssentials/OSX/GLEssentialsGLView.m b/GLEssentials/OSX/GLView.m
similarity index 96%
rename from GLEssentials/OSX/GLEssentialsGLView.m
rename to GLEssentials/OSX/GLView.m
index 2f11d35..567764c 100644
--- a/GLEssentials/OSX/GLEssentialsGLView.m
+++ b/GLEssentials/OSX/GLView.m
@@ -1,25 +1,25 @@
 //
 //
-//  iOSGLEssentials
+//  OSX GLEssentials
 //
 //  Copied from the Apple GLEssentials
 //
 //
 
-#import "GLEssentialsGLView.h"
+#import "GLView.h"
 #import "Game.h"
 
 @import GLKit;
 @import QuartzCore;
 
-@interface GLEssentialsGLView (){
+@interface GLView (){
    	CVDisplayLinkRef displayLink;
     Game* game;
 }
 - (void) initGL;
 @end
 
-@implementation GLEssentialsGLView
+@implementation GLView
 
 - (CVReturn) getFrameForTime:(const CVTimeStamp*)outputTime{
 	// There is no autorelease pool when this method is called
@@ -39,7 +39,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,
 									  CVOptionFlags* flagsOut, 
 									  void* displayLinkContext)
 {
-    CVReturn result = [(__bridge GLEssentialsGLView*)displayLinkContext getFrameForTime:outputTime];
+    CVReturn result = [(__bridge GLView*)displayLinkContext getFrameForTime:outputTime];
     return result;
 }
 
diff --git a/GLEssentials/OSX/MainMenu.xib b/GLEssentials/OSX/MainMenu.xib
index cd8f512..b9a9281 100644
--- a/GLEssentials/OSX/MainMenu.xib
+++ b/GLEssentials/OSX/MainMenu.xib
@@ -1,588 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4457.6</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4457.6</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="90632081">
-			<object class="NSCustomObject" id="486364360">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1035516885">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="405552742">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="272187220">
-				<string key="NSTitle">AMainMenu</string>
-				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="358823679">
-						<reference key="NSMenu" ref="272187220"/>
-						<string key="NSTitle">OSXGLEssentials</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="77751979">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="907913823">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="870519225">
-							<string key="NSTitle">OSXGLEssentials</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="1031860713">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">About OSXGLEssentialPractices</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="419577662">
-									<reference key="NSMenu" ref="870519225"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="580600437">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="32280392">
-									<reference key="NSMenu" ref="870519225"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="827343213">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="344449109">
-										<string key="NSTitle">Services</string>
-										<array class="NSMutableArray" key="NSMenuItems"/>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="1050756762">
-									<reference key="NSMenu" ref="870519225"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="287068359">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">Hide OSXGLEssentialPractices</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="942645836">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="567730237">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="836990092">
-									<reference key="NSMenu" ref="870519225"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-								<object class="NSMenuItem" id="767000474">
-									<reference key="NSMenu" ref="870519225"/>
-									<string key="NSTitle">Quit OSXGLEssentialPractices</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-							</array>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="102739154">
-						<reference key="NSMenu" ref="272187220"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="77751979"/>
-						<reference key="NSMixedImage" ref="907913823"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="631823079">
-							<string key="NSTitle">Help</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="621165125">
-									<reference key="NSMenu" ref="631823079"/>
-									<string key="NSTitle">MacGLEssentialPractices Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="77751979"/>
-									<reference key="NSMixedImage" ref="907913823"/>
-								</object>
-							</array>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</array>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSWindowTemplate" id="414626874">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{200, 200}, {320, 480}}</string>
-				<int key="NSWTFlags">1954021376</int>
-				<string key="NSWindowTitle">OSXGLEssentialPractices</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="10404108">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">1792</int>
-					<object class="NSPSMatrix" key="NSFrameMatrix"/>
-					<string key="NSFrameSize">{320, 480}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSCustomObject" id="869686893">
-				<string key="NSClassName">GLEssentialsGLView</string>
-			</object>
-			<object class="NSCustomObject" id="862971392">
-				<string key="NSClassName">GLEssentialsWindowController</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<bool key="usesAutoincrementingIDs">NO</bool>
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="405552742"/>
-						<reference key="destination" ref="767000474"/>
-					</object>
-					<string key="id">449</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="486364360"/>
-						<reference key="destination" ref="1031860713"/>
-					</object>
-					<string key="id">142</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="486364360"/>
-						<reference key="destination" ref="869686893"/>
-					</object>
-					<string key="id">495</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1035516885"/>
-						<reference key="destination" ref="287068359"/>
-					</object>
-					<string key="id">367</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1035516885"/>
-						<reference key="destination" ref="942645836"/>
-					</object>
-					<string key="id">368</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1035516885"/>
-						<reference key="destination" ref="621165125"/>
-					</object>
-					<string key="id">493</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1035516885"/>
-						<reference key="destination" ref="567730237"/>
-					</object>
-					<string key="id">370</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="862971392"/>
-						<reference key="destination" ref="10404108"/>
-					</object>
-					<string key="id">hMc-Rf-8LH</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="862971392"/>
-						<reference key="destination" ref="414626874"/>
-					</object>
-					<string key="id">z3B-S9-PsV</string>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<string key="id">0</string>
-						<array key="object" id="0"/>
-						<reference key="children" ref="90632081"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-2</string>
-						<reference key="object" ref="486364360"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-1</string>
-						<reference key="object" ref="1035516885"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-3</string>
-						<reference key="object" ref="405552742"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">29</string>
-						<reference key="object" ref="272187220"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="358823679"/>
-							<reference ref="102739154"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">56</string>
-						<reference key="object" ref="358823679"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="870519225"/>
-						</array>
-						<reference key="parent" ref="272187220"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">57</string>
-						<reference key="object" ref="870519225"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1031860713"/>
-							<reference ref="419577662"/>
-							<reference ref="580600437"/>
-							<reference ref="32280392"/>
-							<reference ref="827343213"/>
-							<reference ref="1050756762"/>
-							<reference ref="287068359"/>
-							<reference ref="942645836"/>
-							<reference ref="567730237"/>
-							<reference ref="836990092"/>
-							<reference ref="767000474"/>
-						</array>
-						<reference key="parent" ref="358823679"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">58</string>
-						<reference key="object" ref="1031860713"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">236</string>
-						<reference key="object" ref="419577662"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">129</string>
-						<reference key="object" ref="580600437"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">143</string>
-						<reference key="object" ref="32280392"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">131</string>
-						<reference key="object" ref="827343213"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="344449109"/>
-						</array>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">130</string>
-						<reference key="object" ref="344449109"/>
-						<reference key="parent" ref="827343213"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">144</string>
-						<reference key="object" ref="1050756762"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">134</string>
-						<reference key="object" ref="287068359"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">145</string>
-						<reference key="object" ref="942645836"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">150</string>
-						<reference key="object" ref="567730237"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">149</string>
-						<reference key="object" ref="836990092"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">136</string>
-						<reference key="object" ref="767000474"/>
-						<reference key="parent" ref="870519225"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">490</string>
-						<reference key="object" ref="102739154"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="631823079"/>
-						</array>
-						<reference key="parent" ref="272187220"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">491</string>
-						<reference key="object" ref="631823079"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="621165125"/>
-						</array>
-						<reference key="parent" ref="102739154"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">492</string>
-						<reference key="object" ref="621165125"/>
-						<reference key="parent" ref="631823079"/>
-						<string key="objectName">Menu Item - OSXGLEssentialPractices Help</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">371</string>
-						<reference key="object" ref="414626874"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="10404108"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Window - OSXGLEssentialPractices</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">372</string>
-						<reference key="object" ref="10404108"/>
-						<reference key="parent" ref="414626874"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">494</string>
-						<reference key="object" ref="869686893"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">GL Essentials View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">M8b-ga-iOS</string>
-						<reference key="object" ref="862971392"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">GL Essentials Window Controller</string>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="-1.showNotes"/>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="-2.showNotes"/>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="-3.showNotes"/>
-				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="129.showNotes"/>
-				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="130.showNotes"/>
-				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="131.showNotes"/>
-				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="134.showNotes"/>
-				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="136.showNotes"/>
-				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="143.showNotes"/>
-				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="144.showNotes"/>
-				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="145.showNotes"/>
-				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="149.showNotes"/>
-				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="150.showNotes"/>
-				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="236.showNotes"/>
-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="29.showNotes"/>
-				<boolean value="NO" key="371.IBNSWindowAutoPositionCentersHorizontal"/>
-				<boolean value="NO" key="371.IBNSWindowAutoPositionCentersVertical"/>
-				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="371.NSWindowTemplate.visibleAtLaunch"/>
-				<boolean value="NO" key="371.showNotes"/>
-				<string key="372.CustomClassName">GLEssentialsGLView</string>
-				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<reference key="372.IBUserGuides" ref="0"/>
-				<boolean value="NO" key="372.showNotes"/>
-				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="490.showNotes"/>
-				<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="491.showNotes"/>
-				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="492.showNotes"/>
-				<string key="494.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="494.showNotes"/>
-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="56.showNotes"/>
-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="57.showNotes"/>
-				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="58.showNotes"/>
-				<string key="M8b-ga-iOS.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="M8b-ga-iOS.object.labelIdentifier">IBBuiltInLabel-Blue</string>
-				<boolean value="NO" key="M8b-ga-iOS.showNotes"/>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">GLEssentialsGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/GLEssentialsGLView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">GLEssentialsWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">view</string>
-						<string key="NS.object.0">GLEssentialsGLView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">view</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">view</string>
-							<string key="candidateClassName">GLEssentialsGLView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/GLEssentialsWindowController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1060" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="4600" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{11, 11}</string>
-			<string key="NSMenuMixedState">{10, 3}</string>
-		</dictionary>
-	</data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1060" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="494" id="495"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <menu title="AMainMenu" systemMenu="main" id="29">
+            <items>
+                <menuItem title="GLEssentials" id="56">
+                    <menu key="submenu" title="GLEssentials" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About GLEssentials" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Preferences…" keyEquivalent="," id="129"/>
+                            <menuItem isSeparatorItem="YES" id="143">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide GLEssentials" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit GLEssentials" keyEquivalent="q" id="136">
+                                <connections>
+                                    <action selector="terminate:" target="-3" id="449"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="490">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="491">
+                        <items>
+                            <menuItem title="GLEssentials Help" keyEquivalent="?" id="492" userLabel="Menu Item - OSXGLEssentialPractices Help">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="493"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="GLEssentials" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="200" y="200" width="320" height="480"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
+            <view key="contentView" id="372" customClass="GLView">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+        </window>
+        <customObject id="494" userLabel="View" customClass="GLView"/>
+        <customObject id="M8b-ga-iOS" userLabel="Window Controller" customClass="WindowController" colorLabel="IBBuiltInLabel-Blue">
+            <connections>
+                <outlet property="view" destination="372" id="hMc-Rf-8LH"/>
+                <outlet property="window" destination="371" id="z3B-S9-PsV"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>
diff --git a/GLEssentials/OSX/WindowController.h b/GLEssentials/OSX/WindowController.h
new file mode 100644
index 0000000..b20f556
--- /dev/null
+++ b/GLEssentials/OSX/WindowController.h
@@ -0,0 +1,16 @@
+//
+//
+//  OSX GLEssentials
+//
+//  Copied from the Apple GLEssentials
+//
+//
+
+@import Cocoa;
+
+@class GLView;
+@interface WindowController : NSWindowController {
+	IBOutlet GLView *view;
+}
+
+@end
diff --git a/GLEssentials/OSX/GLEssentialsWindowController.m b/GLEssentials/OSX/WindowController.m
similarity index 84%
rename from GLEssentials/OSX/GLEssentialsWindowController.m
rename to GLEssentials/OSX/WindowController.m
index f67205e..3b5f5c7 100644
--- a/GLEssentials/OSX/GLEssentialsWindowController.m
+++ b/GLEssentials/OSX/WindowController.m
@@ -1,24 +1,24 @@
 //
 //
-//  iOSGLEssentials
+//  OSX GLEssentials
 //
 //  Copied from the Apple GLEssentials
 //
 //
 
-#import "GLEssentialsWindowController.h"
-#import "GLEssentialsFullscreenWindow.h"
-#import "GLEssentialsGLView.h"
+#import "WindowController.h"
+#import "FullscreenWindow.h"
+#import "GLView.h"
 
-@interface GLEssentialsWindowController () {
-    GLEssentialsFullscreenWindow *fullscreenWindow; // Fullscreen window
+@interface WindowController () {
+    FullscreenWindow *fullscreenWindow; // Fullscreen window
     NSWindow* standardWindow; // Non-Fullscreen window (also the initial window)
 }
 
 @end
 
 
-@implementation GLEssentialsWindowController
+@implementation WindowController
 
 - (id)initWithWindow:(NSWindow *) window{
 	if (self = [super initWithWindow:window]){
@@ -34,7 +34,7 @@
 	}
 
 	// Allocate a new fullscreen window
-	fullscreenWindow = [[GLEssentialsFullscreenWindow alloc] init];
+	fullscreenWindow = [[FullscreenWindow alloc] init];
 
 	// Resize the view to screensize
     view.frame = fullscreenWindow.frame;
diff --git a/GLEssentials/OSX/main.m b/GLEssentials/OSX/main.m
index 96c9dd6..23fe944 100644
--- a/GLEssentials/OSX/main.m
+++ b/GLEssentials/OSX/main.m
@@ -1,3 +1,11 @@
+//
+//
+//  OSX GLEssentials
+//
+//  Copied from the Apple GLEssentials
+//
+//
+
 @import Cocoa;
 
 int main(int argc, char *argv[]){
diff --git a/GLEssentials/iOS/AppDelegate.h b/GLEssentials/iOS/AppDelegate.h
index 2f29ade..520f3b5 100644
--- a/GLEssentials/iOS/AppDelegate.h
+++ b/GLEssentials/iOS/AppDelegate.h
@@ -1,6 +1,6 @@
 //
 //  AppDelegate.h
-//  temp
+//  iOS GLEssentials
 //
 //  Created by Joshua Moerman on 07/03/14.
 //  Copyright (c) 2014 Joshua Moerman. All rights reserved.
diff --git a/GLEssentials/iOS/AppDelegate.m b/GLEssentials/iOS/AppDelegate.m
index bbbbb27..08ffddb 100644
--- a/GLEssentials/iOS/AppDelegate.m
+++ b/GLEssentials/iOS/AppDelegate.m
@@ -1,6 +1,6 @@
 //
 //  AppDelegate.m
-//  temp
+//  iOS GLEssentials
 //
 //  Created by Joshua Moerman on 07/03/14.
 //  Copyright (c) 2014 Joshua Moerman. All rights reserved.
diff --git a/GLEssentials/iOS/GLEssentials-Info.plist b/GLEssentials/iOS/GLEssentials-Info.plist
index ebb4a57..1ef165e 100644
--- a/GLEssentials/iOS/GLEssentials-Info.plist
+++ b/GLEssentials/iOS/GLEssentials-Info.plist
@@ -8,6 +8,10 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
 	<key>CFBundleIdentifier</key>
 	<string>com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/GLEssentials/iOS/ViewController.h b/GLEssentials/iOS/ViewController.h
index d77dcb0..396aee8 100644
--- a/GLEssentials/iOS/ViewController.h
+++ b/GLEssentials/iOS/ViewController.h
@@ -1,6 +1,6 @@
 //
 //  ViewController.h
-//  temp
+//  iOS GLEssentials
 //
 //  Created by Joshua Moerman on 07/03/14.
 //  Copyright (c) 2014 Joshua Moerman. All rights reserved.
diff --git a/GLEssentials/iOS/ViewController.m b/GLEssentials/iOS/ViewController.m
index 35ddbac..b8c4d71 100644
--- a/GLEssentials/iOS/ViewController.m
+++ b/GLEssentials/iOS/ViewController.m
@@ -1,6 +1,6 @@
 //
 //  ViewController.m
-//  temp
+//  iOS GLEssentials
 //
 //  Created by Joshua Moerman on 07/03/14.
 //  Copyright (c) 2014 Joshua Moerman. All rights reserved.
diff --git a/GLEssentials/iOS/main.m b/GLEssentials/iOS/main.m
index 699495b..eeadc8c 100644
--- a/GLEssentials/iOS/main.m
+++ b/GLEssentials/iOS/main.m
@@ -1,3 +1,11 @@
+//
+//  main.m
+//  iOS GLEssentials
+//
+//  Created by Joshua Moerman on 07/03/14.
+//  Copyright (c) 2014 Joshua Moerman. All rights reserved.
+//
+
 @import UIKit;
 #import "AppDelegate.h"