diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
new file mode 100644
index 0000000000000000000000000000000000000000..8aa1c597af0db3263cdcf9ffae5ebf0b65ddbf87
--- /dev/null
+++ b/assets/sass/_theme/blocks/base.sass
@@ -0,0 +1,7 @@
+[class^="block-"]
+    @include in-page-with-sidebar
+        h3, h2
+            @extend .h2
+    @include in-page-without-sidebar
+        h3, h2
+            @extend .h5
\ No newline at end of file
diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass
index 596031b148a624644ca1730ea04bf909e181666f..caabb0efd080766ca25bffd7a6f25c1d7856927f 100644
--- a/assets/sass/_theme/hugo-osuny.sass
+++ b/assets/sass/_theme/hugo-osuny.sass
@@ -29,6 +29,7 @@
 @import "design-system/typography"
 
 // Blocks
+@import "blocks/base"
 @import "blocks/datatable"
 @import "blocks/call_to_action"
 @import "blocks/chapter"