diff --git a/assets/scss/core/functions/_index.scss b/assets/scss/core/functions/_index.scss
index 15e1e37b..83ef0a6a 100644
--- a/assets/scss/core/functions/_index.scss
+++ b/assets/scss/core/functions/_index.scss
@@ -1,2 +1,2 @@
-@forward "rgba" as fi-*;
-@forward "var" as fi-*;
+@forward "rgba";
+@forward "var";
diff --git a/assets/scss/core/functions/_rgba.scss b/assets/scss/core/functions/_rgba.scss
index f421cf73..acc8ecc0 100644
--- a/assets/scss/core/functions/_rgba.scss
+++ b/assets/scss/core/functions/_rgba.scss
@@ -5,6 +5,6 @@
 /// @param {Number} $alpha [1] - Alpha channel value in range 0..1.
 /// @example
 ///   color: fi-rgba(fi-var(secondary), 0.2);
-@function rgba($color, $alpha: 1) {
-  @return string.unquote("rgb(from #{$color} r g b / #{$alpha})");
+@function fi-rgba($color, $alpha: 1) {
+  @return rgb(from $color r g b / $alpha);
 }
diff --git a/assets/scss/core/functions/_var.scss b/assets/scss/core/functions/_var.scss
index afc65f6e..a00debeb 100644
--- a/assets/scss/core/functions/_var.scss
+++ b/assets/scss/core/functions/_var.scss
@@ -9,13 +9,10 @@
 /// @example
 ///   color: fi-var(global-font-color);
 ///   background: fi-var(custom-bg, #fff);
-@function var($name, $fallback: null) {
+@function fi-var($name, $fallback: null) {
   @if $fallback != null {
-    @if meta.type-of($fallback) == string {
-      @return string.unquote('var(#{$rootPrefix}#{$name}, "#{$fallback}")');
-    }
-    @return string.unquote("var(#{$rootPrefix}#{$name}, #{$fallback})");
+    @return var(#{$rootPrefix}#{$name}, $fallback);
   }
 
-  @return string.unquote("var(#{$rootPrefix}#{$name})");
+  @return var(#{$rootPrefix}#{$name});
 }
diff --git a/layouts/_partials/init/index.html b/layouts/_partials/init/index.html
index dd317ecd..40ebfe50 100644
--- a/layouts/_partials/init/index.html
+++ b/layouts/_partials/init/index.html
@@ -8,7 +8,7 @@
   Called from: layouts/baseof.html.
 */ -}}
 
-{{- hugo.Store.Set "version" "v1.0.0-alpha-msixwsck" -}}
+{{- hugo.Store.Set "version" "v1.0.0-alpha-mspj0oak" -}}
 {{- .Store.Set "this" dict -}}
 
 {{- partial "init/detection-env.html" . -}}