diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
index 69e5375f3..2da614b33 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
@@ -3,25 +3,30 @@
 #}
 
 {# Core Theme Components #}
-{{ asset_add("theme.js", "theme::js/popper.min.js") }}
-{{ asset_add("theme.js", "theme::js/bootstrap.min.js") }}
-{{ asset_add("theme.js", "theme::js/modal_include.js") }}
-{{ asset_add("theme.js", "theme::js/select2.js") }}
-{{ asset_add("theme.js", "theme::js/params.js") }}
-{{ asset_add("theme.js", "theme::js/jquery.maskedinput.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/popper.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/bootstrap.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/modal_include.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/select2.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/params.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.maskedinput.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }}
-{{ asset_add("theme.js", "theme::js/phoneField.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/phoneField.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
 
-
-
 {# Theme Scripts #}
 {#{{ asset_add("theme.js", "theme::js/plugins/*") }}#}
-{{ asset_add("theme.js", "theme::js/theme/initialize.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }}
 
 {{ asset_script("theme.js") }}
 
+{# Include Styles Loaded From Outside #}
+<style type="text/css">
+    {% for style in asset_inlines("styles.css", ["min"]) %}
+    {{ style|raw }}
+    {% endfor %}
+</style>
+
 {# Include Scripts Loaded From Outside #}
 <script type="text/javascript">
     {% for script in asset_inlines("scripts.js", ["min"]) %}
@@ -34,11 +39,3 @@
     {{ script|raw }}
     {% endfor %}
 </script>
-
-{# Include Styles Loaded From Outside #}
-<style type="text/css">
-    {% for style in asset_inlines("styles.css", ["min"]) %}
-    {{ style|raw }}
-    {% endfor %}
-</style>
-
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
index 3120cef97..b6d03062f 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
@@ -10,19 +10,24 @@
 {#{{ favicons("theme::img/favicon.png") }}#}
 
 {# Base Theme Components #}
-{{ asset_add("theme.css", "theme::css/bootstrap.min.css") }}
-{{ asset_add("theme.css", "theme::css/theme.css") }}
-{{ asset_add("theme.css", "theme::css/select2.css") }}
-{{ asset_add("theme.css", "theme::css/font-awesome.min.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/bootstrap.min.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/theme.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }}
 {{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
 
-<script src="{{ asset_path('theme::js/vendor/jquery.min.js') }}"></script>
+<script src="{{ asset_path('visiosoft.theme.base::js/vendor/jquery.min.js') }}"></script>
 
 {{ asset_style("theme.css") }}
 
 {% include "visiosoft.theme.base::partials/styles" %}
 
-
+{# Custom Theme Components #}
+<style type="text/css">
+    {% for style in asset_inlines("custom-theme.css", ["min"]) %}
+    {{ style|raw }}
+    {% endfor %}
+</style>
 
 {# Important!! #}
 {{ constants() }}