diff --git a/src/_sassMagic.scss b/src/_sassMagic.scss
index b2e960a..eba0d3d 100644
--- a/src/_sassMagic.scss
+++ b/src/_sassMagic.scss
@@ -1,6 +1,57 @@
 // Import Functions
-@import "functions/*";
+@import "functions/_amcss.scss";
+@import "functions/_calc-percent.scss";
+@import "functions/_convert.scss";
+@import "functions/_decimal.scss";
+@import "functions/_exponent.scss";
+@import "functions/_leastSquaresFit.scss";
+@import "functions/_linear-interpolation.scss";
+@import "functions/_list-remove.scss";
+@import "functions/_list-sort.scss";
+@import "functions/_map-sort.scss";
+@import "functions/_number.scss";
+@import "functions/_polygon.scss";
+@import "functions/_strip-units.scss";
+@import "functions/_unit-length.scss";
+@import "functions/_z-index.scss";
 
 // Import Mixins
-@import "mixins/*;
-
+@import "mixins/_alerts.scss";
+@import "mixins/_amcss.scss";
+@import "mixins/_angled-edges.scss";
+@import "mixins/_animation.scss";
+@import "mixins/_BEM.scss";
+@import "mixins/_box-center.scss";
+@import "mixins/_box-clamp.scss";
+@import "mixins/_burger.scss";
+@import "mixins/_buttons.scss";
+@import "mixins/_calc.scss";
+@import "mixins/_caret.scss";
+@import "mixins/_corners.scss";
+@import "mixins/_equal-parts.scss";
+@import "mixins/_fade-text.scss";
+@import "mixins/_flex-grid.scss";
+@import "mixins/_fluid-ratio.scss";
+@import "mixins/_full-width.scss";
+@import "mixins/_geometric-size.scss";
+@import "mixins/_gradient.scss";
+@import "mixins/_haslines.scss";
+@import "mixins/_HolyGrail-layout.scss";
+@import "mixins/_media-queries.scss";
+@import "mixins/_open-color.scss";
+@import "mixins/_palettetown.scss";
+@import "mixins/_plumber-box.scss";
+@import "mixins/_plumber.scss";
+@import "mixins/_poly-fluid-sizing.scss";
+@import "mixins/_polygon.scss";
+@import "mixins/_position.scss";
+@import "mixins/_resize.scss";
+@import "mixins/_ribbon.scss";
+@import "mixins/_scrollbars.scss";
+@import "mixins/_selector.scss";
+@import "mixins/_sprite-spirit.scss";
+@import "mixins/_sticky-footer.scss";
+@import "mixins/_tilted.scss";
+@import "mixins/_triangle.scss";
+@import "mixins/_typographic.scss";
+@import "mixins/_visuallyhidden.scss";
diff --git a/src/mixins/_box-clamp.scss b/src/mixins/_box-clamp.scss
index 1ab795f..189152a 100755
--- a/src/mixins/_box-clamp.scss
+++ b/src/mixins/_box-clamp.scss
@@ -5,11 +5,11 @@
 /// 
 /// //SCSS
 /// div {
-/// 	@include box-clamp;
+/// 	@include ellipsis;
 /// }
 ///
 ///	.box {
-/// 	@include box-clamp(3);
+/// 	@include ellipsis(3);
 ///	}
 ///	//CSS
 ///	div {
@@ -34,7 +34,7 @@
 ///
 
 @mixin ellipsis($lines: 1, $substract: 0) {
-    @if $line == 1 {
+    @if $lines == 1 {
         white-space: nowrap;
         text-overflow: ellipsis;
         width: 100% - $substract;