diff --git a/less/.gitignore b/less/.gitignore
new file mode 100644
index 0000000..e6037df
--- /dev/null
+++ b/less/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+# *
+# Except this file
+!.gitignore
diff --git a/less/Bold.less b/less/Bold.less
new file mode 100755
index 0000000..442ac42
--- /dev/null
+++ b/less/Bold.less
@@ -0,0 +1,8 @@
+/* BEGIN Bold */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "Bold");
+  font-weight: bold;
+  font-style: normal;
+}
+/* END Bold */
diff --git a/less/BoldItalic.less b/less/BoldItalic.less
new file mode 100755
index 0000000..d9142da
--- /dev/null
+++ b/less/BoldItalic.less
@@ -0,0 +1,8 @@
+/* BEGIN Bold Italic */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "BoldItalic");
+  font-weight: bold;
+  font-style: italic;
+}
+/* END Bold Italic */
diff --git a/less/ExtraBold.less b/less/ExtraBold.less
new file mode 100755
index 0000000..8a70823
--- /dev/null
+++ b/less/ExtraBold.less
@@ -0,0 +1,8 @@
+/* BEGIN Extrabold */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "ExtraBold");
+  font-weight: 800;
+  font-style: normal;
+}
+/* END Extrabold */
diff --git a/less/ExtraBoldItalic.less b/less/ExtraBoldItalic.less
new file mode 100755
index 0000000..7ea5fca
--- /dev/null
+++ b/less/ExtraBoldItalic.less
@@ -0,0 +1,8 @@
+/* BEGIN Extrabold Italic */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "ExtraBoldItalic");
+  font-weight: 800;
+  font-style: italic;
+}
+/* END Extrabold Italic */
diff --git a/less/Italic.less b/less/Italic.less
new file mode 100755
index 0000000..973a162
--- /dev/null
+++ b/less/Italic.less
@@ -0,0 +1,8 @@
+/* BEGIN Italic */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "Italic");
+  font-weight: normal;
+  font-style: italic;
+}
+/* END Italic */
diff --git a/less/Light.less b/less/Light.less
new file mode 100755
index 0000000..465dd06
--- /dev/null
+++ b/less/Light.less
@@ -0,0 +1,8 @@
+/* BEGIN Light */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "Light");
+  font-weight: 300;
+  font-style: normal;
+}
+/* END Light */
diff --git a/less/LightItalic.less b/less/LightItalic.less
new file mode 100755
index 0000000..65bf91c
--- /dev/null
+++ b/less/LightItalic.less
@@ -0,0 +1,8 @@
+/* BEGIN Light Italic */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "LightItalic");
+  font-weight: 300;
+  font-style: italic;
+}
+/* END Light Italic */
diff --git a/less/Regular.less b/less/Regular.less
new file mode 100755
index 0000000..528bbbc
--- /dev/null
+++ b/less/Regular.less
@@ -0,0 +1,8 @@
+/* BEGIN Regular */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "Regular");
+  font-weight: normal;
+  font-style: normal;
+}
+/* END Regular */
diff --git a/less/Semibold.less b/less/Semibold.less
new file mode 100755
index 0000000..2470947
--- /dev/null
+++ b/less/Semibold.less
@@ -0,0 +1,8 @@
+/* BEGIN Semibold */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "Semibold");
+  font-weight: 600;
+  font-style: normal;
+}
+/* END Semibold */
diff --git a/less/SemiboldItalic.less b/less/SemiboldItalic.less
new file mode 100755
index 0000000..831b270
--- /dev/null
+++ b/less/SemiboldItalic.less
@@ -0,0 +1,8 @@
+/* BEGIN Semibold Italic */
+@font-face {
+  font-family: 'Open Sans';
+  .fontdef(@OpenSansPath, @OpenSansVersion, "SemiboldItalic");
+  font-weight: 600;
+  font-style: italic;
+}
+/* END Semibold Italic */
diff --git a/less/mixins.less b/less/mixins.less
new file mode 100644
index 0000000..02a63ed
--- /dev/null
+++ b/less/mixins.less
@@ -0,0 +1,8 @@
+.fontdef(@OpenSansPath, @OpenSansVersion, @FontType:"Regular") {
+  src:  url('@{OpenSansPath}/@{FontType}/OpenSans-@{FontType}.eot?v=@{OpenSansVersion}');
+  src:  url('@{OpenSansPath}/@{FontType}/OpenSans-@{FontType}.eot?#iefix&v=@{OpenSansVersion}') format('embedded-opentype'),
+        url('@{OpenSansPath}/@{FontType}/OpenSans-@{FontType}.woff2?v=@{OpenSansVersion}') format('woff2'),
+        url('@{OpenSansPath}/@{FontType}/OpenSans-@{FontType}.woff?v=@{OpenSansVersion}') format('woff'),
+        url('@{OpenSansPath}/@{FontType}/OpenSans-@{FontType}.ttf?v=@{OpenSansVersion}') format('truetype'),
+        url('@{OpenSansPath}/@{FontType}/OpenSans-@{FontType}.svg?v=@{OpenSansVersion}#@{FontType}') format('svg');
+}
diff --git a/less/open-sans.less b/less/open-sans.less
new file mode 100755
index 0000000..22dbbe8
--- /dev/null
+++ b/less/open-sans.less
@@ -0,0 +1,12 @@
+@import "variables";
+@import "mixins";
+@import "Light";
+@import "LightItalic";
+@import "Regular";
+@import "Italic";
+@import "Semibold";
+@import "SemiboldItalic";
+@import "Bold";
+@import "BoldItalic";
+@import "ExtraBold";
+@import "ExtraBoldItalic";
diff --git a/less/variables.less b/less/variables.less
new file mode 100755
index 0000000..495d237
--- /dev/null
+++ b/less/variables.less
@@ -0,0 +1,2 @@
+@OpenSansPath: "./fonts";
+@OpenSansVersion: "1.1.0";
diff --git a/open-sans.less b/open-sans.less
index 236a402..c96212c 100644
--- a/open-sans.less
+++ b/open-sans.less
@@ -1,133 +1,12 @@
-/* Open Sans @font-face kit */
-
-@OpenSansPath: "./fonts";
-
-/* BEGIN Light */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/Light/OpenSans-Light.eot');
-  src: url('@{OpenSansPath}/Light/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/Light/OpenSans-Light.woff') format('woff'),
-       url('@{OpenSansPath}/Light/OpenSans-Light.ttf') format('truetype'),
-       url('@{OpenSansPath}/Light/OpenSans-Light.svg#OpenSansLight') format('svg');
-  font-weight: 300;
-  font-style: normal;
-}
-/* END Light */
-
-/* BEGIN Light Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.eot');
-  src: url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.woff') format('woff'),
-       url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.ttf') format('truetype'),
-       url('@{OpenSansPath}/LightItalic/OpenSans-LightItalic.svg#OpenSansLightItalic') format('svg');
-  font-weight: 300;
-  font-style: italic;
-}
-/* END Light Italic */
-
-/* BEGIN Regular */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/Regular/OpenSans-Regular.eot');
-  src: url('@{OpenSansPath}/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/Regular/OpenSans-Regular.woff') format('woff'),
-       url('@{OpenSansPath}/Regular/OpenSans-Regular.ttf') format('truetype'),
-       url('@{OpenSansPath}/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* END Regular */
-
-/* BEGIN Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/Italic/OpenSans-Italic.eot');
-  src: url('@{OpenSansPath}/Italic/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/Italic/OpenSans-Italic.woff') format('woff'),
-       url('@{OpenSansPath}/Italic/OpenSans-Italic.ttf') format('truetype'),
-       url('@{OpenSansPath}/Italic/OpenSans-Italic.svg#OpenSansItalic') format('svg');
-  font-weight: normal;
-  font-style: italic;
-}
-/* END Italic */
-
-/* BEGIN Semibold */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/Semibold/OpenSans-Semibold.eot');
-  src: url('@{OpenSansPath}/Semibold/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/Semibold/OpenSans-Semibold.woff') format('woff'),
-       url('@{OpenSansPath}/Semibold/OpenSans-Semibold.ttf') format('truetype'),
-       url('@{OpenSansPath}/Semibold/OpenSans-Semibold.svg#OpenSansSemibold') format('svg');
-  font-weight: 600;
-  font-style: normal;
-}
-/* END Semibold */
-
-/* BEGIN Semibold Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.eot');
-  src: url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.woff') format('woff'),
-       url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.ttf') format('truetype'),
-       url('@{OpenSansPath}/SemiboldItalic/OpenSans-SemiboldItalic.svg#OpenSansSemiboldItalic') format('svg');
-  font-weight: 600;
-  font-style: italic;
-}
-/* END Semibold Italic */
-
-/* BEGIN Bold */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/Bold/OpenSans-Bold.eot');
-  src: url('@{OpenSansPath}/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/Bold/OpenSans-Bold.woff') format('woff'),
-       url('@{OpenSansPath}/Bold/OpenSans-Bold.ttf') format('truetype'),
-       url('@{OpenSansPath}/Bold/OpenSans-Bold.svg#OpenSansBold') format('svg');
-  font-weight: bold;
-  font-style: normal;
-}
-/* END Bold */
-
-/* BEGIN Bold Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.eot');
-  src: url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.woff') format('woff'),
-       url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.ttf') format('truetype'),
-       url('@{OpenSansPath}/BoldItalic/OpenSans-BoldItalic.svg#OpenSansBoldItalic') format('svg');
-  font-weight: bold;
-  font-style: italic;
-}
-/* END Bold Italic */
-
-/* BEGIN Extrabold */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.eot');
-  src: url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.woff') format('woff'),
-       url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.ttf') format('truetype'),
-       url('@{OpenSansPath}/ExtraBold/OpenSans-ExtraBold.svg#OpenSansExtrabold') format('svg');
-  font-weight: 800;
-  font-style: normal;
-}
-/* END Extrabold */
-
-/* BEGIN Extrabold Italic */
-@font-face {
-  font-family: 'Open Sans';
-  src: url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot');
-  src: url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.eot?#iefix') format('embedded-opentype'),
-       url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.woff') format('woff'),
-       url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.ttf') format('truetype'),
-       url('@{OpenSansPath}/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg#OpenSansExtraboldItalic') format('svg');
-  font-weight: 800;
-  font-style: italic;
-}
-/* END Extrabold Italic */
+@import "less/variables";
+@import "less/mixins";
+@import "less/Light";
+@import "less/LightItalic";
+@import "less/Regular";
+@import "less/Italic";
+@import "less/Semibold";
+@import "less/SemiboldItalic";
+@import "less/Bold";
+@import "less/BoldItalic";
+@import "less/ExtraBold";
+@import "less/ExtraBoldItalic";
\ No newline at end of file