diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
new file mode 100644
index 00000000..c6ecdc63
--- /dev/null
+++ b/.github/workflows/preview.yml
@@ -0,0 +1,38 @@
+name: Deploy PR previews
+
+on: pull_request
+
+concurrency: preview-${{ github.ref }}
+
+jobs:
+  deploy-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Set up php 8.3
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+      - name: Set up PHP dependencie
+        run: composer i
+      - name: Change config.php
+        run: |
+          sed -i "s|libresign.coop|libresign.github.io|g" CNAME
+          sed -i "s|baseUrl' => '/'|baseUrl' => '/site-preview/pr-preview/pr-${{ github.event.pull_request.number }}/'|g" config.php
+          cat config.php|grep baseUrl
+          sed -i "/'matomo_container'/d" config.production.php
+      - name: Run composer command
+        run: composer prod
+
+      - name: Deploy preview
+        uses: rossjrw/pr-preview-action@v1
+        with:
+          source-dir: ./build_production/
+          pages-base-url: libresign.github.io/site-preview
+          deploy-repository: LibreSign/site-preview
+          preview-branch: main
+          token: ${{ secrets.PREVIEW_TOKEN }}
diff --git a/composer.json b/composer.json
index 6ec776dd..c0a3d517 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         "tightenco/jigsaw": "^1.7",
         "gregwar/captcha": "^1.2",
         "libresign/espeak": "dev-main",
-        "elaborate-code/jigsaw-localization": "dev-fix/use-package-default-locale",
+        "elaborate-code/jigsaw-localization": "dev-main",
         "nesbot/carbon": "^3.3",
         "samdark/sitemap": "^2.4"
     },
diff --git a/composer.lock b/composer.lock
index 23992bfc..af07804b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "74fc40313b12e89f2a98ff912ca4b7b8",
+    "content-hash": "13b0204aa5bbde1b9c0d698037ee13bd",
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -243,16 +243,16 @@
         },
         {
             "name": "elaborate-code/jigsaw-localization",
-            "version": "dev-fix/use-package-default-locale",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LibreSign/jigsaw-localization.git",
-                "reference": "047abccb52ea5e7ec3c1fb036390700a1e9af54d"
+                "reference": "30a889439bd82cc498971b3d2354788c4acd95a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LibreSign/jigsaw-localization/zipball/047abccb52ea5e7ec3c1fb036390700a1e9af54d",
-                "reference": "047abccb52ea5e7ec3c1fb036390700a1e9af54d",
+                "url": "https://api.github.com/repos/LibreSign/jigsaw-localization/zipball/30a889439bd82cc498971b3d2354788c4acd95a8",
+                "reference": "30a889439bd82cc498971b3d2354788c4acd95a8",
                 "shasum": ""
             },
             "require": {
@@ -260,14 +260,21 @@
                 "php": "^8.0"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8",
                 "laravel/pint": "^1.2",
-                "pestphp/pest": "^1.22",
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
                 "tightenco/jigsaw": "^1.7"
             },
+            "default-branch": true,
             "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                }
+            },
             "autoload": {
                 "files": [
                     "src/helpers.php"
@@ -283,14 +290,14 @@
                 }
             },
             "scripts": {
+                "bin": [
+                    "echo 'bin not installed'"
+                ],
                 "analyse": [
                     "vendor/bin/phpstan analyse"
                 ],
                 "test": [
-                    "vendor/bin/pest"
-                ],
-                "test-coverage": [
-                    "vendor/bin/pest --coverage"
+                    "vendor/bin/phpunit  --colors=always"
                 ],
                 "format": [
                     "vendor/bin/pint"
@@ -307,9 +314,9 @@
             ],
             "description": "Brings localization feature to \"tightenco/jigsaw\" using JSON files",
             "support": {
-                "source": "https://github.com/LibreSign/jigsaw-localization/tree/fix/use-package-default-locale"
+                "source": "https://github.com/LibreSign/jigsaw-localization/tree/main"
             },
-            "time": "2024-04-03T16:02:46+00:00"
+            "time": "2025-03-08T22:07:46+00:00"
         },
         {
             "name": "elaborate-code/php-json-tongue",
@@ -4705,12 +4712,12 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "libresign/espeak": 20,
-        "elaborate-code/jigsaw-localization": 20
+        "elaborate-code/jigsaw-localization": 20,
+        "libresign/espeak": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
+    "platform": {},
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }
diff --git a/source/_assets/js/main.js b/source/_assets/js/main.js
index ba94ce13..5c34d2d7 100644
--- a/source/_assets/js/main.js
+++ b/source/_assets/js/main.js
@@ -18,9 +18,9 @@ require('aos/dist/aos.css');
 
     // === logo change
     if (ud_header.classList.contains("sticky")) {
-      logo.src = "/assets/images/logo/logo-2.svg";
+      logo.src = window.baseUrl + "/assets/images/logo/logo-2.svg";
     } else {
-      logo.src = "/assets/images/logo/logo.svg";
+      logo.src = window.baseUrl + "/assets/images/logo/logo.svg";
     }
 
     // show or hide the back-top-top button
@@ -90,4 +90,4 @@ require('aos/dist/aos.css');
   document.querySelector(".back-to-top").onclick = () => {
     scrollTo(document.documentElement);
   };
-})();
\ No newline at end of file
+})();
diff --git a/source/_layouts/footer.blade.php b/source/_layouts/footer.blade.php
index fddb0ab1..d3453f38 100644
--- a/source/_layouts/footer.blade.php
+++ b/source/_layouts/footer.blade.php
@@ -16,7 +16,7 @@
             <div class="row">
                 <div class="col-xl-3 col-lg-4 col-md-6">
                     <div class="ud-widget">
-                        <a href="{{ locale_path($page, $page->baseUrl) }}#home" class="ud-footer-logo">
+                        <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}#home" class="ud-footer-logo">
                             <img src="{{ $page->baseUrl }}assets/images/logo/logo.svg" alt="logo" />
                         </a>
                         <p class="ud-widget-desc">
@@ -89,7 +89,7 @@
                 <div class="col-md-8">
                     <ul class="ud-footer-bottom-left">
                         <li>
-                            <a href="{{ locale_path($page, $page->baseUrl) }}privacy-policy">{{ $page->t("Privacy policy")}}</a>
+                            <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}privacy-policy">{{ $page->t("Privacy policy")}}</a>
                         </li>
                     </ul>
                 </div>
@@ -120,7 +120,10 @@
     </script>
 
     <!-- ====== All Javascript Files ====== -->
-    <script defer src="{{ mix('js/main.js', 'assets/build') }}"></script>
+    <script>
+      window.baseUrl = "{{ $page->baseUrl === '/' ? '' : $page->baseUrl }}";
+    </script>
+    <script defer src="{{ $page->baseUrl . mix('js/main.js', 'assets/build') }}"></script>
     <script>
         document.getElementById('back-to-top').onclick = function(e) {
             e.preventDefault()
diff --git a/source/_layouts/header.blade.php b/source/_layouts/header.blade.php
index 81a8aa61..760abb1c 100644
--- a/source/_layouts/header.blade.php
+++ b/source/_layouts/header.blade.php
@@ -3,7 +3,7 @@
       <div class="row">
         <div class="col-lg-12">
           <nav class="navbar navbar-expand-lg">
-            <a class="navbar-brand" href="{{ locale_path($page, $page->baseUrl) }}">
+            <a class="navbar-brand" href="{{ $page->baseUrl . locale_path($page, '') }}">
               <img src="{{ $page->baseUrl }}assets/images/logo/logo.svg" alt="Logo" />
             </a>
             <button class="navbar-toggler" title="{{$page->t("Toggle navigation menu")}}">
@@ -15,32 +15,32 @@
             <div class="navbar-collapse">
               <ul id="nav" class="navbar-nav mx-auto">
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}#home">{{$page->t("Home")}}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, '') }}#home">{{$page->t("Home")}}</a>
                 </li>
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}#features">{{$page->t("Features")}}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, '') }}#features">{{$page->t("Features")}}</a>
                 </li>
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}#about">{{ $page->t("About") }}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, '') }}#about">{{ $page->t("About") }}</a>
                 </li>
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}pricing">{{ $page->t('Pricing')}}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, 'pricing') }}">{{ $page->t('Pricing')}}</a>
                 </li>
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}#target_audience">{{ $page->t("Target audience") }}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, '') }}#target_audience">{{ $page->t("Target audience") }}</a>
                 </li>
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}#contact">{{ $page->t("Contact") }}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, '') }}#contact">{{ $page->t("Contact") }}</a>
                 </li>
                 <li class="nav-item">
-                  <a class="ud-menu-scroll" href="{{ locale_path($page, $page->baseUrl) }}posts">{{ $page->t("Posts") }}</a>
+                  <a class="ud-menu-scroll" href="{{ rtrim($page->baseUrl, '/') . locale_path($page, 'posts') }}">{{ $page->t("Posts") }}</a>
                 </li>
                 <li class="nav-item nav-item-has-children">
                   <a href="javascript:void(0)">{{ $page->t('Language') }}</a>
                   <ul class="ud-submenu">
                   @foreach($page->locales as $localeCode => $localeName)
                     <li class="ud-submenu-item">
-                      <a class="ud-submenu-link" href="{{ translate_url($page, $localeCode) }}">{{ $localeName }}</a>
+                      <a class="ud-submenu-link" href="/{{ translate_url($page, $localeCode) }}">{{ $localeName }}</a>
                     </li>
                   @endforeach
                   </ul>
diff --git a/source/_layouts/main.blade.php b/source/_layouts/main.blade.php
index e8bb1d8b..27c9ff73 100644
--- a/source/_layouts/main.blade.php
+++ b/source/_layouts/main.blade.php
@@ -35,7 +35,7 @@
     />
 
     <!-- ===== All CSS files ===== -->
-    <link rel="stylesheet" href="{{ mix('css/main.css', 'assets/build') }}">
+    <link rel="stylesheet" href="{{ $page->baseUrl . mix('css/main.css', 'assets/build') }}">
     <link rel="stylesheet" href="{{ $page->baseUrl }}assets/build/css/ud-styles.css" />
   </head>
   <body>
diff --git a/source/index.blade.php b/source/index.blade.php
index 3576f546..d5c8adc8 100644
--- a/source/index.blade.php
+++ b/source/index.blade.php
@@ -16,7 +16,7 @@
               </p>
               <ul class="ud-hero-buttons">
                 <li>
-                  <a href="{{ locale_path($page, $page->baseUrl) }}contact-us" class="ud-main-btn ud-white-btn mt-1">
+                  <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}" class="ud-main-btn ud-white-btn mt-1">
                     {{ $page->t('Talk to sales') }}
                   </a>
                 </li>
@@ -192,7 +192,7 @@ class="shape shape-2"
             <img src="{{ $page->baseUrl }}assets/images/mobile_libresign.png" alt="print_main_screen"/>
           </div>
           <div class="col-lg-12 d-flex justify-content-center mt-5">
-            <a href="{{ locale_path($page, $page->baseUrl) }}contact-us" class="ud-main-btn ud-border-btn">
+            <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}contact-us" class="ud-main-btn ud-border-btn">
               {{ $page->t('Talk to sales') }}
             </a>
           </div>
diff --git a/source/pricing.blade.php b/source/pricing.blade.php
index e9fa7615..e1f929e9 100644
--- a/source/pricing.blade.php
+++ b/source/pricing.blade.php
@@ -43,7 +43,7 @@ class="ud-single-pricing first-item{{ $content->isActive ? ' active' : ''}} wow
                 </div>
               @endif
               <div class="ud-pricing-footer">
-                <a href="{{ locale_path($page, $page->baseUrl) }}contact-us" class="ud-main-btn ud-border-btn">
+                <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}contact-us" class="ud-main-btn ud-border-btn">
                   {{ $page->t('Under Consultation') }}
                 </a>
               </div>
@@ -89,7 +89,7 @@ class="ud-single-pricing first-item{{ $content->isActive ? ' active' : ''}} wow
       </div>
 
       <div class="ud-pricing-footer text-center mt-5">
-        <a href="{{ locale_path($page, $page->baseUrl) }}contact-us" class="ud-main-btn ud-white-btn mt-1">
+        <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}contact-us" class="ud-main-btn ud-white-btn mt-1">
           {{ $page->t('Under Consultation') }}
         </a>
       </div>
@@ -127,7 +127,7 @@ class="ud-single-pricing first-item{{ $content->isActive ? ' active' : ''}} wow
         </div>
       </div>
       <div class="ud-pricing-footer text-center mt-5">
-        <a href="{{ locale_path($page, $page->baseUrl) }}contact-us" class="ud-main-btn ud-white-btn mt-1">
+        <a href="{{ $page->baseUrl . locale_path($page, 'contact-us') }}contact-us" class="ud-main-btn ud-white-btn mt-1">
           {{ $page->t('Under Consultation') }}
         </a>
       </div>