diff --git a/openVulkanoCpp/Math/Math.hpp b/openVulkanoCpp/Math/Math.hpp
index 5d908ef..73ffa2d 100644
--- a/openVulkanoCpp/Math/Math.hpp
+++ b/openVulkanoCpp/Math/Math.hpp
@@ -85,11 +85,12 @@ namespace OpenVulkano::Math
 		}
 	}
 
-	template<typename T> using Matrix2_SIMD = glm::tmat2x2<T, glm::aligned>;
-	template<typename T> using Matrix3_SIMD = glm::tmat3x3<T, glm::aligned>;
-	template<typename T> using Matrix4_SIMD = glm::tmat4x4<T, glm::aligned>;
-	template<typename T> using Matrix2 = glm::tmat2x2<T, glm::packed>;
-	template<typename T> using Matrix3 = glm::tmat3x3<T, glm::packed>;
+	template<int S, typename T, glm::qualifier Q> using Matrix = glm::mat<S, S, T, Q>;
+	template<typename T> using Matrix2_SIMD = Matrix<2, T, glm::aligned>;
+	template<typename T> using Matrix3_SIMD = Matrix<3, T, glm::aligned>;
+	template<typename T> using Matrix4_SIMD = Matrix<4, T, glm::aligned>;
+	template<typename T> using Matrix2 = Matrix<2, T, glm::packed>;
+	template<typename T> using Matrix3 = Matrix<3, T, glm::packed>;
 	template<typename T> using Matrix4 = Matrix4_SIMD<T>;
 	//template<typename T> using Matrix4 = glm::tmat4x4<T, glm::packed>;
 
@@ -123,11 +124,12 @@ namespace OpenVulkano::Math
 	typedef Matrix4_SIMD<int32_t> Matrix4i_SIMD;
 	typedef Matrix4_SIMD<int64_t> Matrix4l_SIMD;
 
-	template<typename T> using Vector2_SIMD = glm::tvec2<T, glm::aligned>;
-	template<typename T> using Vector3_SIMD = glm::tvec3<T, glm::aligned>;
-	template<typename T> using Vector4_SIMD = glm::tvec4<T, glm::aligned>;
-	template<typename T> using Vector2 = glm::tvec2<T, glm::packed>;
-	template<typename T> using Vector3 = glm::tvec3<T, glm::packed>;
+	template<int S, typename T, glm::qualifier Q> using Vector = glm::vec<S, T, Q>;
+	template<typename T> using Vector2_SIMD = Vector<2, T, glm::aligned>;
+	template<typename T> using Vector3_SIMD = Vector<3, T, glm::aligned>;
+	template<typename T> using Vector4_SIMD = Vector<4, T, glm::aligned>;
+	template<typename T> using Vector2 = Vector<2, T, glm::packed>;
+	template<typename T> using Vector3 = Vector<3, T, glm::packed>;
 	template<typename T> using Vector4 = Vector4_SIMD<T>;
 	//template<typename T> using Vector4 = glm::tvec4<T, glm::packed>;