diff --git a/engine.vcxproj b/engine.vcxproj
index a6b7a33..0476470 100644
--- a/engine.vcxproj
+++ b/engine.vcxproj
@@ -183,13 +183,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="engine\app.hpp" />
-    <ClInclude Include="engine\image.hpp" />
+    <ClInclude Include="engine\app.h" />
+    <ClInclude Include="engine\image.h" />
     <ClInclude Include="engine\layout.h" />
     <ClInclude Include="engine\pch.h" />
-    <ClInclude Include="engine\shader.hpp" />
-    <ClInclude Include="engine\shape.hpp" />
-    <ClInclude Include="engine\texture.hpp" />
+    <ClInclude Include="engine\shader.h" />
+    <ClInclude Include="engine\shape.h" />
+    <ClInclude Include="engine\texture.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/engine.vcxproj.filters b/engine.vcxproj.filters
index 53df085..bb20b84 100644
--- a/engine.vcxproj.filters
+++ b/engine.vcxproj.filters
@@ -50,22 +50,22 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="engine\app.hpp">
+    <ClInclude Include="engine\app.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\image.hpp">
+    <ClInclude Include="engine\image.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="engine\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\shader.hpp">
+    <ClInclude Include="engine\shader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\shape.hpp">
+    <ClInclude Include="engine\shape.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\texture.hpp">
+    <ClInclude Include="engine\texture.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="engine\layout.h">
diff --git a/engine.xcodeproj/project.pbxproj b/engine.xcodeproj/project.pbxproj
index f987223..38d4695 100644
--- a/engine.xcodeproj/project.pbxproj
+++ b/engine.xcodeproj/project.pbxproj
@@ -49,21 +49,21 @@
 		AD58E05F1E12DA86006ACC15 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		AD58E0611E17F23D006ACC15 /* data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = data; sourceTree = "<group>"; };
 		AD58E0631E2A76FD006ACC15 /* shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shader.cpp; sourceTree = "<group>"; };
-		AD58E0641E2A76FD006ACC15 /* shader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = shader.hpp; sourceTree = "<group>"; };
+		AD58E0641E2A76FD006ACC15 /* shader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = shader.h; sourceTree = "<group>"; };
 		AD58E0661E2A7741006ACC15 /* image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image.cpp; sourceTree = "<group>"; };
-		AD58E0671E2A7741006ACC15 /* image.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = image.hpp; sourceTree = "<group>"; };
+		AD58E0671E2A7741006ACC15 /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = image.h; sourceTree = "<group>"; };
 		AD58E0691E2A774F006ACC15 /* texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = texture.cpp; sourceTree = "<group>"; };
-		AD58E06A1E2A774F006ACC15 /* texture.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = texture.hpp; sourceTree = "<group>"; };
+		AD58E06A1E2A774F006ACC15 /* texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = texture.h; sourceTree = "<group>"; };
 		AD58E06C1E2A78BD006ACC15 /* pch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pch.h; sourceTree = "<group>"; };
 		AD58E06D1E2A80BC006ACC15 /* shape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shape.cpp; sourceTree = "<group>"; };
-		AD58E06E1E2A80BC006ACC15 /* shape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = shape.hpp; sourceTree = "<group>"; };
+		AD58E06E1E2A80BC006ACC15 /* shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = shape.h; sourceTree = "<group>"; };
 		AD58E0701E2A90EF006ACC15 /* app.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app.cpp; sourceTree = "<group>"; };
-		AD58E0711E2A90EF006ACC15 /* app.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = app.hpp; sourceTree = "<group>"; };
+		AD58E0711E2A90EF006ACC15 /* app.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = app.h; sourceTree = "<group>"; };
 		AD58E0741E3421F2006ACC15 /* YGNodeList.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = YGNodeList.c; path = libs/yoga/yoga/YGNodeList.c; sourceTree = "<group>"; };
 		AD58E0751E3421F2006ACC15 /* Yoga.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Yoga.c; path = libs/yoga/yoga/Yoga.c; sourceTree = "<group>"; };
 		AD58E0781E342205006ACC15 /* tinyxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxml2.cpp; path = libs/tinyxml2/tinyxml2.cpp; sourceTree = "<group>"; };
 		ADB61C801E3D38450093280F /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = "<group>"; };
-		ADB61C811E3D38450093280F /* util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = util.hpp; sourceTree = "<group>"; };
+		ADB61C811E3D38450093280F /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = util.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -109,18 +109,18 @@
 				AD3B1EBE1E3B8B7600E918E3 /* layout.cpp */,
 				AD3B1EBF1E3B8B7600E918E3 /* layout.h */,
 				AD58E0631E2A76FD006ACC15 /* shader.cpp */,
-				AD58E0641E2A76FD006ACC15 /* shader.hpp */,
+				AD58E0641E2A76FD006ACC15 /* shader.h */,
 				AD58E0521E107411006ACC15 /* main.cpp */,
 				AD58E06D1E2A80BC006ACC15 /* shape.cpp */,
-				AD58E06E1E2A80BC006ACC15 /* shape.hpp */,
+				AD58E06E1E2A80BC006ACC15 /* shape.h */,
 				AD58E0701E2A90EF006ACC15 /* app.cpp */,
-				AD58E0711E2A90EF006ACC15 /* app.hpp */,
+				AD58E0711E2A90EF006ACC15 /* app.h */,
 				AD58E0661E2A7741006ACC15 /* image.cpp */,
-				AD58E0671E2A7741006ACC15 /* image.hpp */,
+				AD58E0671E2A7741006ACC15 /* image.h */,
 				AD58E0691E2A774F006ACC15 /* texture.cpp */,
-				AD58E06A1E2A774F006ACC15 /* texture.hpp */,
+				AD58E06A1E2A774F006ACC15 /* texture.h */,
 				ADB61C801E3D38450093280F /* util.cpp */,
-				ADB61C811E3D38450093280F /* util.hpp */,
+				ADB61C811E3D38450093280F /* util.h */,
 				AD58E06C1E2A78BD006ACC15 /* pch.h */,
 			);
 			path = engine;
diff --git a/engine/app.cpp b/engine/app.cpp
index 41298ec..52887e5 100644
--- a/engine/app.cpp
+++ b/engine/app.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "app.hpp"
+#include "app.h"
 
 App App::I; // singleton
 
diff --git a/engine/app.hpp b/engine/app.h
similarity index 85%
rename from engine/app.hpp
rename to engine/app.h
index 487d683..3fe45b9 100644
--- a/engine/app.hpp
+++ b/engine/app.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "shader.hpp"
-#include "shape.hpp"
-#include "texture.hpp"
+#include "shader.h"
+#include "shape.h"
+#include "texture.h"
 #include "layout.h"
 
 class App
diff --git a/engine/font.cpp b/engine/font.cpp
new file mode 100644
index 0000000..8562dd0
--- /dev/null
+++ b/engine/font.cpp
@@ -0,0 +1,4 @@
+#include "font.h"
+
+
+
diff --git a/engine/font.h b/engine/font.h
new file mode 100644
index 0000000..531a62b
--- /dev/null
+++ b/engine/font.h
@@ -0,0 +1,4 @@
+#pragma once
+
+
+
diff --git a/engine/image.cpp b/engine/image.cpp
index 6189db1..b46446f 100644
--- a/engine/image.cpp
+++ b/engine/image.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "image.hpp"
+#include "image.h"
 
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb/stb_image.h>
diff --git a/engine/image.hpp b/engine/image.h
similarity index 100%
rename from engine/image.hpp
rename to engine/image.h
diff --git a/engine/layout.cpp b/engine/layout.cpp
index ab3e92d..64c18f9 100644
--- a/engine/layout.cpp
+++ b/engine/layout.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "layout.h"
-#include "util.hpp"
+#include "util.h"
 
 Plane WidgetBorder::m_plane;
 
diff --git a/engine/layout.h b/engine/layout.h
index 9c34488..72f3c32 100644
--- a/engine/layout.h
+++ b/engine/layout.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "shape.hpp"
-#include "util.hpp"
-#include "shader.hpp"
+#include "shape.h"
+#include "util.h"
+#include "shader.h"
 
 enum class kAttribute : uint16_t 
 {
diff --git a/engine/main.cpp b/engine/main.cpp
index fa7258a..3d363c2 100644
--- a/engine/main.cpp
+++ b/engine/main.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
-#include "shader.hpp"
-#include "shape.hpp"
-#include "texture.hpp"
-#include "image.hpp"
-#include "app.hpp"
+#include "shader.h"
+#include "shape.h"
+#include "texture.h"
+#include "image.h"
+#include "app.h"
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/engine/shader.cpp b/engine/shader.cpp
index a0161df..5d500ae 100644
--- a/engine/shader.cpp
+++ b/engine/shader.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "shader.hpp"
+#include "shader.h"
 
 std::map<kShader, Shader> ShaderManager::m_shaders;
 Shader* ShaderManager::m_current;
diff --git a/engine/shader.hpp b/engine/shader.h
similarity index 98%
rename from engine/shader.hpp
rename to engine/shader.h
index 3bb97cc..4e21454 100644
--- a/engine/shader.hpp
+++ b/engine/shader.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "util.hpp"
+#include "util.h"
 
 enum class kShaderUniform : uint16_t
 {
diff --git a/engine/shape.cpp b/engine/shape.cpp
index bdf5ff3..114d47f 100644
--- a/engine/shape.cpp
+++ b/engine/shape.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "shape.hpp"
+#include "shape.h"
 
 bool Shape::create_buffers(GLvoid* idx, GLvoid* vertices, int isize, int vsize)
 {
diff --git a/engine/shape.hpp b/engine/shape.h
similarity index 100%
rename from engine/shape.hpp
rename to engine/shape.h
diff --git a/engine/texture.cpp b/engine/texture.cpp
index 7de17d0..63a0304 100644
--- a/engine/texture.cpp
+++ b/engine/texture.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
-#include "texture.hpp"
-#include "image.hpp"
+#include "texture.h"
+#include "image.h"
 
 bool Texture2D::create(int width, int height, GLint format, const uint8_t* data)
 {
diff --git a/engine/texture.hpp b/engine/texture.h
similarity index 100%
rename from engine/texture.hpp
rename to engine/texture.h
diff --git a/engine/util.hpp b/engine/util.h
similarity index 100%
rename from engine/util.hpp
rename to engine/util.h