app-functions-fn.common.php.diff

diff --git a/app/functions/fn.common.php b/app/functions/fn.common.php
index 409fa72..6fbb762 100644
--- a/app/functions/fn.common.php
+++ b/app/functions/fn.common.php
@@ -5440,7 +5440,7 @@ function fn_merge_styles($files, $styles='', $prepend_prefix = '', $params = arr
         $make_rtl = true;
     }
 
-    $css_suffix = 'css' . DIRECTORY_SEPARATOR;
+    $css_suffix = 'css/';
 
     $output = '';
     $less_output = '';

app-Tygh-Themes-Themes.php.diff

diff --git a/app/Tygh/Themes/Themes.php b/app/Tygh/Themes/Themes.php
index 937cb03..759a777 100644
--- a/app/Tygh/Themes/Themes.php
+++ b/app/Tygh/Themes/Themes.php
@@ -840,11 +840,9 @@ class Themes
      */
     public function convertToRelativePath($path)
     {
-        if (isset($path[0]) && $path[0] == '/') {
-            foreach ($this->content_paths as $content_path) {
-                $abs_paths = fn_array_column($content_path, self::PATH_ABSOLUTE);
-                $path = trim(str_replace($abs_paths, '', $path), '/');
-            }
+        foreach ($this->content_paths as $content_path) {
+            $abs_paths = fn_array_column($content_path, self::PATH_ABSOLUTE);
+            $path = trim(str_replace($abs_paths, '', $path), '/');
         }
 
         return $path;