diff --git a/resources/modules/spin-sass_typographic/scss/_base.scss b/resources/modules/spin-sass_typographic/scss/_base.scss
index b46baec..79a8c08 100644
--- a/resources/modules/spin-sass_typographic/scss/_base.scss
+++ b/resources/modules/spin-sass_typographic/scss/_base.scss
@@ -1,7 +1,5 @@
-$theme: custom !default;
-
 @import "~unreset-css/unreset";
-@import "~gutenberg-web-type/src/style/gutenberg";
+@import "./base/gutenberg";
 
 h1, h2, h3, h4, h5, h6 {
   margin-top: 0;
diff --git a/resources/modules/spin-sass_typographic/scss/base/_gutenberg.scss b/resources/modules/spin-sass_typographic/scss/base/_gutenberg.scss
new file mode 100644
index 0000000..cd41e4d
--- /dev/null
+++ b/resources/modules/spin-sass_typographic/scss/base/_gutenberg.scss
@@ -0,0 +1,33 @@
+$theme: custom !default;
+
+@import "~gutenberg-web-type/src/style/gutenberg-config";
+@import "~gutenberg-web-type/src/style/mixins/font-size";
+@import "~gutenberg-web-type/src/style/mixins/line-height";
+@import "~gutenberg-web-type/src/style/mixins/margin";
+@import "~gutenberg-web-type/src/style/mixins/padding";
+@import "~gutenberg-web-type/src/style/helpers/alignment";
+@import "~gutenberg-web-type/src/style/layout/aside";
+@import "~gutenberg-web-type/src/style/layout/base";
+@import "~gutenberg-web-type/src/style/layout/footer";
+@import "~gutenberg-web-type/src/style/layout/header";
+@import "~gutenberg-web-type/src/style/layout/main";
+@import "~gutenberg-web-type/src/style/layout/section";
+@import "~gutenberg-web-type/src/style/modules/anchor";
+@import "~gutenberg-web-type/src/style/modules/article";
+@import "~gutenberg-web-type/src/style/modules/audio";
+@import "~gutenberg-web-type/src/style/modules/canvas";
+@import "~gutenberg-web-type/src/style/modules/code";
+@import "~gutenberg-web-type/src/style/modules/details";
+@import "~gutenberg-web-type/src/style/modules/figure";
+@import "~gutenberg-web-type/src/style/modules/form";
+@import "~gutenberg-web-type/src/style/modules/heading";
+@import "~gutenberg-web-type/src/style/modules/horizontal-rule";
+@import "~gutenberg-web-type/src/style/modules/image";
+@import "~gutenberg-web-type/src/style/modules/list";
+@import "~gutenberg-web-type/src/style/modules/navigation";
+@import "~gutenberg-web-type/src/style/modules/progress";
+@import "~gutenberg-web-type/src/style/modules/quote";
+@import "~gutenberg-web-type/src/style/modules/table";
+@import "~gutenberg-web-type/src/style/modules/template";
+@import "~gutenberg-web-type/src/style/modules/text";
+@import "~gutenberg-web-type/src/style/modules/video";