diff --git a/index.html b/index.html
index 9174b5e..4826812 100644
--- a/index.html
+++ b/index.html
@@ -2,8 +2,18 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="theme-color" content="#0d0d0d" />
+    <meta name="msapplication-config" content="/assets/favicon/browserconfig.xml" />
+    <meta name="msapplication-TileColor" content="#f0941d" />
+
+    <link rel="icon" type="image/x-icon" href="/assets/favicon/favicon.ico" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png" />
+    <link rel="mask-icon" href="/assets/favicon/safari-pinned-tab.svg" color="#f0941d" />
+    <link rel="manifest" href="/assets/favicon/site.webmanifest" />
+
     <title>Lapikud</title>
     <script>
       (function () {
diff --git a/public/assets/LapLogo_black_white.png b/public/assets/LapLogo_black_white.png
deleted file mode 100644
index 3ad7a84..0000000
Binary files a/public/assets/LapLogo_black_white.png and /dev/null differ
diff --git a/public/assets/LapLogo_white_orange.png b/public/assets/LapLogo_white_orange.png
deleted file mode 100644
index 3fd93ab..0000000
Binary files a/public/assets/LapLogo_white_orange.png and /dev/null differ
diff --git a/public/assets/favicon/browserconfig.xml b/public/assets/favicon/browserconfig.xml
index 7d0ee53..b798281 100644
--- a/public/assets/favicon/browserconfig.xml
+++ b/public/assets/favicon/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/assets/favicon/mstile-150x150.png?v=LbyW42We5z"/>
+            <square150x150logo src="/assets/favicon/mstile-150x150.png"/>
             <TileColor>#da532c</TileColor>
         </tile>
     </msapplication>
diff --git a/public/assets/favicon/site.webmanifest b/public/assets/favicon/site.webmanifest
index 24647c8..5c39330 100644
--- a/public/assets/favicon/site.webmanifest
+++ b/public/assets/favicon/site.webmanifest
@@ -1,19 +1,21 @@
 {
-    "name": "",
-    "short_name": "",
+    "name": "MTÜ Lapikud",
+    "short_name": "Lapikud",
     "icons": [
         {
-            "src": "/assets/favicon/android-chrome-192x192.png?v=LbyW42We5z",
+            "src": "/assets/favicon/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/assets/favicon/android-chrome-512x512.png?v=LbyW42We5z",
+            "src": "/assets/favicon/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }
     ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
+    "theme_color": "#0d0d0d",
+    "background_color": "#fffdfa",
+    "start_url": "/",
+    "scope": "/",
     "display": "standalone"
 }
diff --git a/public/assets/logo.svg b/public/assets/logo.svg
new file mode 100644
index 0000000..a806627
--- /dev/null
+++ b/public/assets/logo.svg
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="286.25748mm"
+   height="104.86195mm"
+   viewBox="0 0 286.25748 104.86195"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   sodipodi:docname="laplogo.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="10.471926"
+     inkscape:cx="42.399077"
+     inkscape:cy="127.72245"
+     inkscape:window-width="1276"
+     inkscape:window-height="1413"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-413.31681,-286.5697)"
+         id="path4" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         id="path6" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-512.91461,-283.9411)"
+         id="path8" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath10">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-679.46942,-252.76981)"
+         id="path10" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath12">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-770.56464,-275.25081)"
+         id="path12" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath14">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-216.05911,-208.83801)"
+         id="path14" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath16">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-233.10031,-201.21051)"
+         id="path16" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath18">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-268.02841,-206.95521)"
+         id="path18" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath20">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-284.21521,-205.69951)"
+         id="path20" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath22">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-318.45941,-193.8484)"
+         id="path22" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath24">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-337.12491,-201.21051)"
+         id="path24" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath26">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-372.05301,-206.95521)"
+         id="path26" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath28">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-389.60751,-201.21051)"
+         id="path28" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath30">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-415.70761,-201.21051)"
+         id="path30" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath32">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-450.63571,-206.95521)"
+         id="path32" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath34">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-461.62211,-193.8484)"
+         id="path34" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath36">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-504.30331,-193.8484)"
+         id="path36" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath38">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-534.15521,-203.4412)"
+         id="path38" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath40">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-565.98781,-197.5984)"
+         id="path40" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath42">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-590.20681,-207.60981)"
+         id="path42" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath44">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-596.68882,-193.8484)"
+         id="path44" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath46">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-637.20832,-205.69951)"
+         id="path46" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath48">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-658.59892,-193.8484)"
+         id="path48" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath50">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-703.80192,-197.5984)"
+         id="path50" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath52">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-726.95992,-199.7326)"
+         id="path52" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath54">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         id="path54" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath56">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-133.2874,-403.24991)"
+         id="path56" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath58">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-205.70851,-330.84601)"
+         id="path58" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath60">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-432.44921,-386.73751)"
+         id="path60" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath62">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-704.49462,-426.00821)"
+         id="path62" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath64">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         transform="translate(-803.6203,-403.24991)"
+         id="path64" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath66">
+      <path
+         d="M 0,0 H 1000 V 600 H 0 Z"
+         id="path66" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-4.9195763,-55.790011)">
+    <path
+       id="path1"
+       d="m 28.547151,144.77524 v -26.00537 h 7.022394 v 20.30836 h 18.982971 v 5.69701 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.352778" />
+    <path
+       id="path2"
+       d="m 69.091339,134.782 h 9.50171 l -4.73216,-9.57686 z m 11.98104,5.07224 H 66.574268 l -2.441575,4.9209 h -7.8359 l 13.608756,-26.00537 h 7.83555 l 13.60804,26.00537 h -7.83519 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.352778" />
+    <path
+       id="path3"
+       d="m 0,0 c 0,1.717 -0.241,3.194 -0.723,4.427 -0.484,1.233 -1.28,2.244 -2.388,3.032 -1.109,0.785 -2.558,1.367 -4.346,1.743 -1.79,0.375 -3.989,0.563 -6.599,0.563 H -42.812 V -9.228 h 28.756 c 2.61,0 4.809,0.152 6.599,0.457 1.788,0.303 3.237,0.821 4.346,1.555 1.108,0.734 1.904,1.69 2.388,2.872 C -0.241,-3.164 0,-1.716 0,0 m 20.119,0.322 c 0,-3.684 -0.535,-7.073 -1.609,-10.166 -1.073,-3.094 -2.799,-5.759 -5.177,-7.995 -2.379,-2.236 -5.464,-3.979 -9.256,-5.229 -3.791,-1.254 -8.404,-1.88 -13.84,-1.88 h -33.049 v -23.283 h -19.906 v 73.716 h 52.955 c 5.436,0 10.049,-0.617 13.84,-1.852 3.792,-1.233 6.877,-2.969 9.256,-5.203 2.378,-2.236 4.104,-4.892 5.177,-7.967 1.074,-3.077 1.609,-6.456 1.609,-10.141"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,116.18018,127.76027)"
+       clip-path="url(#clipPath4)" />
+    <path
+       id="path5"
+       d="m 449.928,312.055 h 19.906 v -73.716 h -19.906 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,-29.628798,228.85569)"
+       clip-path="url(#clipPath6)" />
+    <path
+       id="path7"
+       d="M 0,0 40.774,28.114 H 67.439 L 17.811,-7.243 70.766,-45.603 H 41.741 L 0,-14.969 V -45.603 H -20.013 V 28.114 H 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,151.31608,128.68758)"
+       clip-path="url(#clipPath8)" />
+    <path
+       id="path9"
+       d="m 0,0 c -1.822,-3.254 -4.558,-6.098 -8.206,-8.53 -3.65,-2.432 -8.203,-4.355 -13.657,-5.767 -5.455,-1.413 -11.83,-2.119 -19.127,-2.119 -7.296,0 -13.689,0.706 -19.179,2.119 -5.491,1.412 -10.059,3.335 -13.708,5.767 -3.648,2.432 -6.385,5.276 -8.209,8.53 -1.824,3.256 -2.736,6.725 -2.736,10.409 v 48.876 h 19.851 V 17.544 c 0,-2.468 0.313,-4.802 0.939,-7 0.625,-2.2 1.805,-4.124 3.541,-5.769 1.735,-1.645 4.165,-2.951 7.297,-3.915 3.128,-0.967 7.197,-1.449 12.204,-1.449 4.972,0 9.014,0.482 12.125,1.449 3.113,0.964 5.535,2.27 7.271,3.915 1.735,1.645 2.904,3.569 3.514,5.769 0.608,2.198 0.911,4.532 0.911,7 V 59.285 H 2.735 V 10.409 C 2.735,6.725 1.826,3.256 0,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,210.07291,139.68413)"
+       clip-path="url(#clipPath10)" />
+    <path
+       id="path11"
+       d="m 0,0 c 0,3.54 -0.455,6.616 -1.368,9.228 -0.913,2.609 -2.38,4.764 -4.399,6.464 -2.022,1.699 -4.658,2.968 -7.913,3.809 -3.256,0.841 -7.225,1.261 -11.91,1.261 H -50.323 V -20.87 h 24.733 c 4.685,0 8.654,0.418 11.91,1.261 3.255,0.838 5.891,2.127 7.913,3.861 2.019,1.735 3.486,3.907 4.399,6.519 C -0.455,-6.618 0,-3.542 0,0 m 20.064,0 c 0,-4.722 -0.517,-8.916 -1.554,-12.582 -1.036,-3.667 -2.494,-6.859 -4.371,-9.577 -1.878,-2.718 -4.134,-5.025 -6.763,-6.921 -2.629,-1.895 -5.55,-3.416 -8.771,-4.56 -3.218,-1.145 -6.687,-1.977 -10.408,-2.494 -3.721,-0.52 -7.6,-0.778 -11.641,-0.778 h -46.784 v 73.716 h 46.677 c 4.041,0 7.921,-0.26 11.641,-0.779 3.721,-0.518 7.197,-1.35 10.436,-2.494 3.234,-1.145 6.177,-2.656 8.826,-4.534 2.646,-1.877 4.909,-4.184 6.787,-6.921 1.877,-2.735 3.335,-5.929 4.371,-9.575 C 19.547,8.852 20.064,4.684 20.064,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,242.20928,131.75333)"
+       clip-path="url(#clipPath12)" />
+    <path
+       id="path13"
+       d="M 0,0 V -14.99 H -5.173 V 0 h -8.128 V 4.169 H 8.142 V 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,46.592051,155.18229)"
+       clip-path="url(#clipPath14)" />
+    <path
+       id="path15"
+       d="M 0,0 H 6.999 L 3.514,7.056 Z M 8.826,-3.736 H -1.855 L -3.654,-7.362 H -9.426 L 0.599,11.796 H 6.372 L 16.397,-7.362 h -5.772 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,52.603807,157.8731)"
+       clip-path="url(#clipPath16)" />
+    <path
+       id="path17"
+       d="m 0,0 c 0,0.372 -0.05,0.687 -0.146,0.947 -0.099,0.261 -0.269,0.472 -0.51,0.636 -0.241,0.162 -0.565,0.281 -0.968,0.355 -0.405,0.074 -0.91,0.112 -1.514,0.112 h -7.084 v -4.1 h 7.084 c 0.604,0 1.109,0.036 1.514,0.112 0.403,0.074 0.727,0.193 0.968,0.355 0.241,0.162 0.411,0.374 0.51,0.634 C -0.05,-0.689 0,-0.372 0,0 m -10.222,-13.107 h -5.172 V 6.051 H -2.427 C -1.032,6.051 0.15,5.907 1.121,5.619 2.093,5.331 2.884,4.921 3.492,4.392 4.101,3.862 4.542,3.223 4.816,2.475 5.09,1.726 5.228,0.892 5.228,-0.028 5.228,-0.837 5.114,-1.543 4.887,-2.148 4.658,-2.753 4.351,-3.269 3.965,-3.702 3.581,-4.134 3.132,-4.499 2.62,-4.797 2.11,-5.094 1.571,-5.34 1.003,-5.536 l 6.275,-7.571 H 1.226 l -5.799,7.056 h -5.649 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,64.925665,155.8465)"
+       clip-path="url(#clipPath18)" />
+    <path
+       id="path19"
+       d="m 0,0 10.595,7.307 h 6.93 L 4.628,-1.881 18.39,-11.851 H 10.847 L 0,-3.89 v -7.961 H -5.202 V 7.307 H 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,70.636009,156.28948)"
+       clip-path="url(#clipPath20)" />
+    <path
+       id="path21"
+       d="m 0,0 h -6.022 l -9.691,19.158 h 5.772 L -2.97,4.74 3.988,19.158 h 5.774 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,82.716599,160.47029)"
+       clip-path="url(#clipPath22)" />
+    <path
+       id="path23"
+       d="M 0,0 H 6.999 L 3.514,7.056 Z M 8.826,-3.736 H -1.855 L -3.654,-7.362 H -9.426 L 0.599,11.796 H 6.372 L 16.397,-7.362 h -5.772 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,89.301379,157.8731)"
+       clip-path="url(#clipPath24)" />
+    <path
+       id="path25"
+       d="m 0,0 c 0,0.372 -0.05,0.687 -0.146,0.947 -0.099,0.261 -0.269,0.472 -0.51,0.636 -0.241,0.162 -0.565,0.281 -0.968,0.355 -0.405,0.074 -0.91,0.112 -1.514,0.112 h -7.084 v -4.1 h 7.084 c 0.604,0 1.109,0.036 1.514,0.112 0.403,0.074 0.727,0.193 0.968,0.355 0.241,0.162 0.411,0.374 0.51,0.634 C -0.05,-0.689 0,-0.372 0,0 m -10.222,-13.107 h -5.172 V 6.051 H -2.427 C -1.032,6.051 0.15,5.907 1.121,5.619 2.093,5.331 2.884,4.921 3.492,4.392 4.101,3.862 4.542,3.223 4.816,2.475 5.09,1.726 5.228,0.892 5.228,-0.028 5.228,-0.837 5.114,-1.543 4.887,-2.148 4.658,-2.753 4.351,-3.269 3.965,-3.702 3.581,-4.134 3.132,-4.499 2.62,-4.797 2.11,-5.094 1.571,-5.34 1.003,-5.536 l 6.275,-7.571 H 1.226 l -5.799,7.056 h -5.649 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,101.62323,155.8465)"
+       clip-path="url(#clipPath26)" />
+    <path
+       id="path27"
+       d="M 0,0 H 6.999 L 3.514,7.056 Z M 8.826,-3.736 H -1.855 L -3.654,-7.362 H -9.426 L 0.599,11.796 H 6.372 L 16.397,-7.362 h -5.772 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,107.81607,157.8731)"
+       clip-path="url(#clipPath28)" />
+    <path
+       id="path29"
+       d="M 0,0 H 6.999 L 3.514,7.056 Z M 8.826,-3.736 H -1.855 L -3.654,-7.362 H -9.426 L 0.599,11.796 H 6.372 L 16.397,-7.362 h -5.772 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,117.0236,157.8731)"
+       clip-path="url(#clipPath30)" />
+    <path
+       id="path31"
+       d="m 0,0 c 0,0.372 -0.05,0.687 -0.146,0.947 -0.099,0.261 -0.269,0.472 -0.51,0.636 -0.241,0.162 -0.565,0.281 -0.968,0.355 -0.405,0.074 -0.91,0.112 -1.514,0.112 h -7.084 v -4.1 h 7.084 c 0.604,0 1.109,0.036 1.514,0.112 0.403,0.074 0.727,0.193 0.968,0.355 0.241,0.162 0.411,0.374 0.51,0.634 C -0.05,-0.689 0,-0.372 0,0 m -10.222,-13.107 h -5.172 V 6.051 H -2.427 C -1.032,6.051 0.15,5.907 1.121,5.619 2.093,5.331 2.884,4.921 3.492,4.392 4.101,3.862 4.542,3.223 4.816,2.475 5.09,1.726 5.228,0.892 5.228,-0.028 5.228,-0.837 5.114,-1.543 4.887,-2.148 4.658,-2.753 4.351,-3.269 3.965,-3.702 3.581,-4.134 3.132,-4.499 2.62,-4.797 2.11,-5.094 1.571,-5.34 1.003,-5.536 l 6.275,-7.571 H 1.226 l -5.799,7.056 h -5.649 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,129.34546,155.8465)"
+       clip-path="url(#clipPath32)" />
+    <path
+       id="path33"
+       d="M 0,0 V 19.158 H 19.396 V 15.072 H 5.312 V 11.908 H 18.671 V 7.822 H 5.312 V 4.086 H 19.591 V 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,133.22122,160.47029)"
+       clip-path="url(#clipPath34)" />
+    <path
+       id="path35"
+       d="M 0,0 -12.926,13.162 V 0 h -5.173 v 19.158 h 5.619 L 0.46,5.939 V 19.158 H 5.605 V 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,148.2782,160.47029)"
+       clip-path="url(#clipPath36)" />
+    <path
+       id="path37"
+       d="M 0,0 C 0,0.92 -0.119,1.719 -0.355,2.398 -0.593,3.076 -0.973,3.636 -1.499,4.079 -2.024,4.52 -2.71,4.849 -3.555,5.068 -4.401,5.286 -5.433,5.397 -6.651,5.397 h -6.428 V -5.424 h 6.428 c 1.218,0 2.25,0.11 3.096,0.327 0.845,0.219 1.531,0.553 2.056,1.004 0.526,0.452 0.906,1.017 1.144,1.695 C -0.119,-1.719 0,-0.92 0,0 M 5.214,0 C 5.214,-1.226 5.08,-2.317 4.811,-3.269 4.541,-4.222 4.162,-5.052 3.674,-5.758 3.187,-6.465 2.601,-7.064 1.917,-7.557 1.233,-8.049 0.474,-8.446 -0.362,-8.742 -1.199,-9.04 -2.102,-9.255 -3.068,-9.391 -4.034,-9.526 -5.044,-9.593 -6.093,-9.593 H -18.252 V 9.565 H -6.12 c 1.049,0 2.058,-0.067 3.025,-0.203 0.966,-0.134 1.87,-0.35 2.711,-0.648 C 0.458,8.416 1.223,8.024 1.91,7.536 2.598,7.049 3.187,6.449 3.674,5.738 4.162,5.026 4.541,4.196 4.811,3.249 5.08,2.301 5.214,1.218 5.214,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,158.80929,157.08616)"
+       clip-path="url(#clipPath38)" />
+    <path
+       id="path39"
+       d="m 0,0 c -0.474,-0.846 -1.185,-1.585 -2.134,-2.217 -0.948,-0.632 -2.131,-1.132 -3.549,-1.499 -1.417,-0.366 -3.074,-0.549 -4.969,-0.549 -1.897,0 -3.559,0.183 -4.985,0.549 -1.428,0.367 -2.615,0.867 -3.563,1.499 -0.949,0.632 -1.66,1.371 -2.134,2.217 -0.473,0.846 -0.711,1.748 -0.711,2.706 v 12.702 h 5.159 V 4.56 c 0,-0.641 0.083,-1.248 0.244,-1.819 0.162,-0.572 0.469,-1.072 0.92,-1.499 0.452,-0.427 1.084,-0.767 1.897,-1.018 0.813,-0.252 1.871,-0.377 3.173,-0.377 1.292,0 2.341,0.125 3.15,0.377 0.808,0.251 1.439,0.591 1.89,1.018 0.45,0.427 0.754,0.927 0.913,1.499 0.158,0.571 0.238,1.178 0.238,1.819 V 15.408 H 0.711 V 2.706 C 0.711,1.748 0.474,0.846 0,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,170.03912,159.14737)"
+       clip-path="url(#clipPath40)" />
+    <path
+       id="path41"
+       d="m 0,0 c -0.363,0.177 -0.842,0.377 -1.437,0.599 -0.594,0.224 -1.267,0.436 -2.022,0.636 -0.753,0.2 -1.571,0.367 -2.453,0.501 -0.883,0.135 -1.79,0.202 -2.72,0.202 -0.742,0 -1.378,-0.023 -1.901,-0.069 -0.526,-0.047 -0.968,-0.107 -1.325,-0.181 -0.358,-0.076 -0.643,-0.16 -0.851,-0.258 -0.21,-0.098 -0.37,-0.198 -0.481,-0.3 -0.112,-0.103 -0.184,-0.205 -0.217,-0.307 -0.032,-0.103 -0.048,-0.194 -0.048,-0.279 0,-0.279 0.14,-0.523 0.419,-0.732 0.277,-0.208 0.659,-0.394 1.142,-0.558 0.484,-0.162 1.045,-0.315 1.688,-0.46 0.641,-0.144 1.321,-0.293 2.043,-0.446 0.72,-0.153 1.464,-0.32 2.231,-0.501 0.766,-0.183 1.51,-0.393 2.23,-0.636 0.72,-0.241 1.401,-0.522 2.043,-0.842 0.641,-0.322 1.203,-0.696 1.687,-1.123 0.484,-0.427 0.864,-0.92 1.143,-1.478 0.279,-0.558 0.419,-1.194 0.419,-1.91 0,-0.92 -0.164,-1.711 -0.489,-2.371 -0.326,-0.659 -0.76,-1.218 -1.303,-1.672 -0.544,-0.457 -1.174,-0.822 -1.889,-1.096 -0.717,-0.274 -1.468,-0.486 -2.253,-0.634 -0.786,-0.148 -1.58,-0.246 -2.384,-0.293 -0.803,-0.046 -1.568,-0.068 -2.293,-0.068 -1.897,0 -3.652,0.155 -5.264,0.466 -1.612,0.31 -3.037,0.7 -4.274,1.165 v 4.573 c 1.273,-0.708 2.727,-1.261 4.358,-1.66 1.632,-0.4 3.376,-0.6 5.235,-0.6 1.097,0 1.991,0.059 2.684,0.174 0.692,0.117 1.235,0.265 1.624,0.446 0.391,0.183 0.656,0.379 0.796,0.593 0.14,0.215 0.208,0.418 0.208,0.615 0,0.306 -0.139,0.573 -0.418,0.801 -0.279,0.227 -0.66,0.427 -1.142,0.599 -0.484,0.172 -1.046,0.331 -1.688,0.474 -0.641,0.145 -1.323,0.289 -2.043,0.432 -0.72,0.145 -1.461,0.3 -2.224,0.467 -0.761,0.169 -1.504,0.365 -2.224,0.593 -0.72,0.229 -1.4,0.492 -2.043,0.795 -0.641,0.302 -1.204,0.66 -1.686,1.074 -0.484,0.413 -0.865,0.892 -1.144,1.436 -0.279,0.545 -0.419,1.173 -0.419,1.89 0,0.846 0.15,1.574 0.447,2.187 0.298,0.615 0.699,1.137 1.207,1.57 0.507,0.432 1.092,0.783 1.755,1.052 0.665,0.271 1.365,0.479 2.1,0.627 0.734,0.15 1.478,0.252 2.231,0.309 0.753,0.055 1.468,0.082 2.146,0.082 0.744,0 1.509,-0.038 2.295,-0.112 0.785,-0.074 1.559,-0.179 2.322,-0.313 0.761,-0.135 1.498,-0.29 2.21,-0.467 C -1.263,4.816 -0.605,4.63 0,4.434 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,178.58305,155.61557)"
+       clip-path="url(#clipPath42)" />
+    <path
+       id="path43"
+       d="M 0,0 V 19.158 H 19.396 V 15.072 H 5.312 V 11.908 H 18.671 V 7.822 H 5.312 V 4.086 H 19.591 V 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,180.86975,160.47029)"
+       clip-path="url(#clipPath44)" />
+    <path
+       id="path45"
+       d="m 0,0 10.597,7.307 h 6.928 L 4.63,-1.881 18.39,-11.851 H 10.849 L 0,-3.89 v -7.961 H -5.202 V 7.307 H 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,195.16413,156.28948)"
+       clip-path="url(#clipPath46)" />
+    <path
+       id="path47"
+       d="M 0,0 V 19.158 H 5.171 V 4.196 H 19.158 V 0 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,202.71026,160.47029)"
+       clip-path="url(#clipPath48)" />
+    <path
+       id="path49"
+       d="m 0,0 c -0.472,-0.846 -1.185,-1.585 -2.133,-2.217 -0.947,-0.632 -2.132,-1.132 -3.548,-1.499 -1.419,-0.366 -3.076,-0.549 -4.971,-0.549 -1.895,0 -3.559,0.183 -4.985,0.549 -1.427,0.367 -2.615,0.867 -3.563,1.499 -0.947,0.632 -1.66,1.371 -2.132,2.217 -0.475,0.846 -0.713,1.748 -0.713,2.706 v 12.702 h 5.161 V 4.56 c 0,-0.641 0.082,-1.248 0.244,-1.819 0.162,-0.572 0.469,-1.072 0.92,-1.499 0.451,-0.427 1.082,-0.767 1.895,-1.018 0.813,-0.252 1.871,-0.377 3.173,-0.377 1.292,0 2.342,0.125 3.152,0.377 0.806,0.251 1.437,0.591 1.888,1.018 0.451,0.427 0.754,0.927 0.913,1.499 0.158,0.571 0.238,1.178 0.238,1.819 V 15.408 H 0.713 V 2.706 C 0.713,1.748 0.475,0.846 0,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,218.65687,159.14737)"
+       clip-path="url(#clipPath50)" />
+    <path
+       id="path51"
+       d="m 0,0 c 0,0.436 -0.076,0.787 -0.224,1.052 -0.148,0.266 -0.379,0.469 -0.696,0.614 -0.317,0.144 -0.723,0.239 -1.226,0.286 -0.503,0.046 -1.103,0.07 -1.799,0.07 h -7.475 v -4.058 h 7.475 c 0.696,0 1.296,0.022 1.799,0.071 0.503,0.044 0.909,0.143 1.226,0.292 0.317,0.149 0.548,0.355 0.696,0.621 C -0.076,-0.787 0,-0.438 0,0 m -1.199,7.598 c 0,0.243 -0.038,0.472 -0.11,0.691 -0.076,0.219 -0.21,0.412 -0.407,0.579 -0.193,0.167 -0.458,0.301 -0.792,0.404 -0.338,0.102 -0.765,0.154 -1.285,0.154 H -11.42 V 5.827 h 7.627 c 0.52,0 0.947,0.047 1.285,0.14 0.334,0.093 0.599,0.219 0.792,0.377 0.197,0.159 0.331,0.346 0.407,0.565 0.072,0.217 0.11,0.448 0.11,0.689 M 5.257,-0.599 C 5.257,-1.344 5.161,-1.99 4.964,-2.537 4.768,-3.087 4.496,-3.559 4.148,-3.953 3.8,-4.348 3.383,-4.67 2.894,-4.914 2.405,-5.161 1.867,-5.357 1.275,-5.5 0.686,-5.645 0.055,-5.745 -0.613,-5.8 -1.282,-5.857 -1.974,-5.884 -2.691,-5.884 h -13.901 v 19.158 h 13.65 c 0.548,0 1.099,-0.024 1.654,-0.071 0.551,-0.046 1.078,-0.132 1.581,-0.256 0.503,-0.126 0.968,-0.3 1.402,-0.524 0.431,-0.222 0.81,-0.515 1.13,-0.878 0.32,-0.362 0.572,-0.8 0.751,-1.311 C 3.759,9.722 3.848,9.119 3.848,8.422 3.848,7.176 3.542,6.187 2.928,5.459 2.315,4.728 1.347,4.243 0.028,4.001 0.958,3.936 1.754,3.795 2.418,3.576 3.083,3.357 3.624,3.061 4.045,2.684 4.461,2.308 4.768,1.847 4.964,1.304 5.161,0.76 5.257,0.126 5.257,-0.599"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,226.8265,158.39447)"
+       clip-path="url(#clipPath52)" />
+    <path
+       id="path53"
+       d="m 736.93,213.007 h 5.171 v -19.158 h -5.171 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,-29.628798,228.85569)"
+       clip-path="url(#clipPath54)" />
+    <path
+       id="path55"
+       d="m 0,0 c 0,-6.563 0.598,-12.614 1.798,-18.154 1.199,-5.54 3.034,-10.85 5.506,-15.93 2.468,-5.082 5.591,-10.022 9.367,-14.821 3.776,-4.799 8.273,-9.737 13.498,-14.819 L 8.256,-87.33 c -6.494,5.152 -12.404,10.692 -17.73,16.619 -5.33,5.929 -9.917,12.42 -13.761,19.477 -3.847,7.058 -6.829,14.802 -8.946,23.236 -2.117,8.432 -3.174,17.766 -3.174,27.998 0,10.232 1.057,19.565 3.174,27.998 2.117,8.432 5.099,16.178 8.946,23.236 3.844,7.055 8.431,13.53 13.761,19.425 5.326,5.891 11.236,11.448 17.73,16.671 L 30.169,63.724 C 24.944,58.644 20.447,53.704 16.671,48.905 12.895,44.106 9.772,39.167 7.304,34.086 4.832,29.004 2.997,23.694 1.798,18.154 0.598,12.614 0,6.563 0,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,17.392034,86.598093)"
+       clip-path="url(#clipPath56)" />
+    <path
+       id="path57"
+       d="M 0,0 V 145.443 H 39.272 V 31.862 H 145.443 V 0 Z"
+       style="fill:#f0941d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,42.940589,112.14058)"
+       clip-path="url(#clipPath58)" />
+    <path
+       id="path59"
+       d="M 0,0 H 53.139 L 26.675,53.563 Z M 67.005,-28.369 H -14.078 L -27.733,-55.892 H -71.556 L 4.553,89.552 H 48.376 L 124.485,-55.892 H 80.662 Z"
+       style="fill:#f0941d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,122.92967,92.423303)"
+       clip-path="url(#clipPath60)" />
+    <path
+       id="path61"
+       d="m 0,0 c 0,3.388 -0.475,6.299 -1.43,8.733 -0.951,2.436 -2.521,4.429 -4.709,5.981 -2.188,1.552 -5.047,2.699 -8.575,3.442 -3.528,0.74 -7.869,1.111 -13.019,1.111 h -56.739 v -37.473 h 56.739 c 5.15,0 9.491,0.3 13.019,0.9 3.528,0.599 6.387,1.622 8.575,3.069 2.188,1.445 3.758,3.335 4.709,5.664 C -0.475,-6.244 0,-3.387 0,0 m 39.694,0.636 c 0,-7.27 -1.057,-13.956 -3.173,-20.059 -2.118,-6.105 -5.522,-11.362 -10.214,-15.772 -4.696,-4.412 -10.783,-7.851 -18.263,-10.322 -7.479,-2.47 -16.584,-3.705 -27.309,-3.705 h -65.207 v -45.94 h -39.272 V 50.281 h 104.479 c 10.725,0 19.83,-1.216 27.309,-3.652 7.48,-2.434 13.567,-5.858 18.263,-10.268 4.692,-4.411 8.096,-9.649 10.214,-15.718 2.116,-6.07 3.173,-12.74 3.173,-20.007"
+       style="fill:#f0941d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,218.90124,78.569473)"
+       clip-path="url(#clipPath62)" />
+    <path
+       id="path63"
+       d="m 0,0 c 0,6.563 -0.599,12.614 -1.798,18.154 -1.203,5.54 -3.035,10.85 -5.506,15.932 -2.47,5.081 -5.594,10.02 -9.367,14.819 -3.776,4.799 -8.275,9.739 -13.498,14.819 l 13.233,14.292 v 0.21 l 8.682,9.104 C -1.836,82.46 3.952,77.062 9.105,71.134 c 3.88,-4.377 7.411,-9.033 10.584,-13.973 3.176,-4.94 5.891,-10.215 8.151,-15.825 2.26,-5.61 4.041,-11.627 5.347,-18.047 1.305,-6.424 2.029,-13.303 2.17,-20.641 V 0 c 0,-7.764 -0.62,-14.996 -1.853,-21.699 -1.237,-6.706 -2.984,-12.967 -5.24,-18.789 -2.26,-5.823 -5.013,-11.257 -8.255,-16.303 -3.249,-5.045 -6.883,-9.827 -10.904,-14.343 -2.401,-2.681 -4.888,-5.239 -7.462,-7.674 -2.577,-2.434 -5.205,-4.78 -7.889,-7.039 -0.351,-0.211 -0.686,-0.423 -1.002,-0.635 -0.321,-0.212 -0.655,-0.493 -1.006,-0.848 l -8.682,9.104 v 0.212 l -13.233,14.29 c 5.223,5.082 9.722,10.02 13.498,14.819 3.773,4.799 6.897,9.739 9.367,14.821 2.471,5.08 4.303,10.39 5.506,15.93 C -0.599,-12.614 0,-6.563 0,0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,253.87058,86.598093)"
+       clip-path="url(#clipPath64)" />
+    <path
+       id="path65"
+       d="m 869.253,436.171 h 40.118 v -38.108 h -40.118 z m 23.709,-126.814 h -32.391 l 8.682,59.597 h 39.06 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       transform="matrix(0.35277776,0,0,-0.35277776,-29.628798,228.85569)"
+       clip-path="url(#clipPath66)" />
+  </g>
+</svg>
diff --git a/src/components/layout/Grid.svelte b/src/components/layout/Grid.svelte
index 5f97922..4d1701d 100644
--- a/src/components/layout/Grid.svelte
+++ b/src/components/layout/Grid.svelte
@@ -2,6 +2,7 @@
   let {
     min = "220px", // min column width (used when columns not set)
     columns = null, // fixed number of columns for desktop
+    tabletColumns = null, // fixed number of columns for tablet / mid screens
     largeColumns = null, // fixed number of columns for large desktop
     mobileColumns = null, // fixed number of columns for mobile
     gap = "gap-3",
@@ -9,6 +10,10 @@
     children,
   } = $props();
 
+  const hasTabletColumns = $derived(tabletColumns !== null);
+  const tabletCols = $derived(
+    tabletColumns ? `repeat(${tabletColumns}, 1fr)` : "1fr"
+  );
   const desktopColumns = $derived(columns ? `repeat(${columns}, 1fr)` : "1fr");
   const largeDesktopColumns = $derived(
     largeColumns ? `repeat(${largeColumns}, 1fr)` : desktopColumns
@@ -18,8 +23,10 @@
 
 <div
   class="grid {className} {gap}"
+  data-has-tablet={hasTabletColumns ? "true" : "false"}
   style="
     --min: {min}; 
+    --tablet-columns: {tabletCols};
     --desktop-columns: {desktopColumns};
     --large-desktop-columns: {largeDesktopColumns};
     --mobile-columns: {mobileCols};
@@ -35,20 +42,44 @@
     grid-template-columns: var(--mobile-columns);
   }
 
-  /* Desktop / tablet screens */
+  /* Legacy mode (no tabletColumns): desktop starts at 768px */
   @media (min-width: 768px) {
-    .grid {
+    .grid[data-has-tablet="false"] {
       grid-template-columns: var(--desktop-columns) !important;
     }
 
     /* fallback for when columns are not set, use minmax */
-    .grid:not([style*="--desktop-columns: repeat"]) {
+    .grid[data-has-tablet="false"]:not([style*="--desktop-columns: repeat"]) {
+      grid-template-columns: repeat(auto-fit, minmax(var(--min), 1fr)) !important;
+    }
+
+    /* Tablet mode (when tabletColumns is provided) */
+    .grid[data-has-tablet="true"] {
+      grid-template-columns: var(--tablet-columns) !important;
+    }
+  }
+
+  /* Legacy large desktop */
+  @media (min-width: 1024px) {
+    .grid[data-has-tablet="false"] {
+      grid-template-columns: var(--large-desktop-columns) !important;
+    }
+  }
+
+  /* Tablet mode desktop breakpoint */
+  @media (min-width: 1200px) {
+    .grid[data-has-tablet="true"] {
+      grid-template-columns: var(--desktop-columns) !important;
+    }
+
+    .grid[data-has-tablet="true"]:not([style*="--desktop-columns: repeat"]) {
       grid-template-columns: repeat(auto-fit, minmax(var(--min), 1fr)) !important;
     }
   }
 
-  @media (min-width: 1024px) {
-    .grid {
+  /* Tablet mode large desktop breakpoint */
+  @media (min-width: 1536px) {
+    .grid[data-has-tablet="true"] {
       grid-template-columns: var(--large-desktop-columns) !important;
     }
   }
diff --git a/src/layout/Navbar.svelte b/src/layout/Navbar.svelte
index ba862b0..ed3a1d9 100644
--- a/src/layout/Navbar.svelte
+++ b/src/layout/Navbar.svelte
@@ -226,7 +226,7 @@
               onClick={() => handleNavigation("/")}
               class="nav-logo-button border-transparent bg-transparent px-0 py-3"
             >
-              <img src="/assets/LapLogo_white_orange.png" alt="Lapikud logo" class="h-12 md:h-14 w-auto" />
+              <img src="/assets/logo.svg" alt="Lapikud logo" class="h-12 md:h-14 w-auto" />
             </Button>
           {/if}
 
@@ -357,7 +357,7 @@
           onClick={() => handleNavigation("/")}
           class="mb-3 border-transparent bg-transparent px-0 py-0 text-left text-white hover:text-white"
         >
-          <img src="/assets/LapLogo_white_orange.png" alt="Lapikud Logo" class="h-12 w-auto" />
+          <img src="/assets/logo.svg" alt="Lapikud Logo" class="h-12 w-auto" />
         </Button>
 
         <!-- About Section -->
diff --git a/src/routes/Contact.svelte b/src/routes/Contact.svelte
index 42760ab..ef732f4 100644
--- a/src/routes/Contact.svelte
+++ b/src/routes/Contact.svelte
@@ -119,7 +119,7 @@
     <p class="text-xl text-gray-600">{$text["methods"]?.subtitle || "Vali endale sobiv viis"}</p>
   </div>
   
-  <Grid columns={2} gap="var(--space-5)">
+  <Grid columns={2} gap="gap-5">
     {#each contactMethods as method}
       <Card variant="glass">
         <div class="flex items-start gap-4">
@@ -222,7 +222,7 @@
 
 <!-- Office Hours & Location -->
 <Section>
-  <Grid gap="var(--space-5)">
+  <Grid gap="gap-5">
     <Card variant="glass">
       <div class="flex items-start gap-4 mb-4">
         <div class="feature-icon" style="color: var(--orange)">
@@ -270,7 +270,7 @@
 
 <!-- Social Media & Legal Info -->
 <Section background="neutral">
-  <Grid gap="var(--space-5)">
+  <Grid gap="gap-5">
     <Card variant="glass">
       <h2 class="text-3xl font-bold mb-6 text-center">{$text["social"]?.title || "Jälgi meid sotsiaalmeedias"}</h2>
       <div class="flex flex-wrap justify-center gap-4">
diff --git a/src/routes/Helpdesk.svelte b/src/routes/Helpdesk.svelte
index 865ea1e..da35b7c 100644
--- a/src/routes/Helpdesk.svelte
+++ b/src/routes/Helpdesk.svelte
@@ -63,7 +63,7 @@
 
 <!-- Main Content -->
 <Section>
-    <Grid min="480px" gap="var(--space-5)">
+  <Grid columns={2} tabletColumns={1} mobileColumns={1} gap="gap-6">
       <!-- What is HELPDESK? -->
       <div class="flex flex-col">
         <h2 class="text-4xl font-light pb-4">{$text["whatIs"]?.title || ""}</h2>
@@ -89,13 +89,13 @@
           <table class="w-full text-lg">
             <thead class="bg-gray-50">
               <tr>
-                <th class="px-6 py-4 text-left font-semibold text-gray-900 border-b border-gray-200">
+                <th class="px-3 py-4 text-left font-semibold text-gray-900 border-b border-gray-200">
                   {$text["pricing"]?.tableHeaders?.service || ""}
                 </th>
-                <th class="px-6 py-4 text-left font-semibold text-gray-900 border-b border-gray-200">
+                <th class="px-3 py-4 text-left font-semibold text-gray-900 border-b border-gray-200">
                   {$text["pricing"]?.tableHeaders?.quantity || ""}
                 </th>
-                <th class="px-6 py-4 text-left font-semibold text-gray-900 border-b border-gray-200">
+                <th class="px-3 py-4 text-left font-semibold text-gray-900 border-b border-gray-200">
                   {$text["pricing"]?.tableHeaders?.price || ""}
                 </th>
               </tr>
@@ -103,9 +103,9 @@
             <tbody class="bg-white divide-y divide-gray-200">
               {#each pricingData.services as service}
                 <tr class="hover:bg-gray-50 transition-colors duration-200">
-                  <td class="px-6 py-4 text-gray-900">{service.name}</td>
-                  <td class="px-6 py-4 text-gray-600">{service.quantity}</td>
-                  <td class="px-6 py-4 font-medium" class:text-green-600={service.price === "Tasuta"} class:text-gray-900={service.price !== "Tasuta"}>
+                  <td class="px-3 py-4 text-gray-900">{service.name}</td>
+                  <td class="px-3 py-4 text-gray-600">{service.quantity}</td>
+                  <td class="px-3 py-4 font-medium" class:text-green-600={service.price === "Tasuta"} class:text-gray-900={service.price !== "Tasuta"}>
                     {service.price}
                   </td>
                 </tr>
diff --git a/src/routes/Home.svelte b/src/routes/Home.svelte
index f98cb5e..0ef2b4e 100644
--- a/src/routes/Home.svelte
+++ b/src/routes/Home.svelte
@@ -56,7 +56,7 @@
     <div class="relative z-20 flex min-h-screen w-full items-stretch py-8 md:py-12">
       <div class="flex w-full max-w-115 flex-col justify-between">
         <Image
-          src="/assets/LapLogo_white_orange.png"
+          src="/assets/logo.svg"
           alt={$text["hero"]?.logoAlt || "MTÜ Lapikud"}
           class="w-full max-w-65 md:max-w-80 h-auto pt-5 md:pt-10"
         />
diff --git a/src/routes/OurWork.svelte b/src/routes/OurWork.svelte
index 29e0051..bcd0c2b 100644
--- a/src/routes/OurWork.svelte
+++ b/src/routes/OurWork.svelte
@@ -94,7 +94,7 @@
     <p class="text-xl text-gray-600">{$text["services"]?.subtitle || "Laia valik IT-teenuseid teie ärivajaduste täitmiseks"}</p>
   </div>
   
-  <Grid columns={2} gap="var(--space-5)">
+  <Grid columns={2} gap="gap-5">
     {#each services as service}
       <Card variant="glass">
         <div class="feature-icon mb-4" style="color: var(--orange)">
@@ -113,7 +113,7 @@
     <h2 class="text-4xl font-bold mb-4">{$text["whyUs"]?.title || "Miks meiega koostööd teha?"}</h2>
   </div>
   
-  <Grid columns={3} gap="var(--space-5)">
+  <Grid columns={3} gap="gap-5">
     {#each whyUs as item}
       <Card variant="glass">
         <div class="feature-icon mb-4" style="color: var(--orange)">
@@ -128,7 +128,7 @@
 
 <!-- Process Section -->
 <Section>
-  <Grid gap="var(--space-5)">
+  <Grid gap="gap-5">
     <Card variant="glass">
       <h2 class="text-4xl font-bold mb-6">{$text["process"]?.title || "Kuidas töötame?"}</h2>
       <div class="space-y-6">
@@ -164,7 +164,7 @@
     <p class="text-xl text-gray-600">{$text["portfolio"]?.subtitle || "Vaata, mida oleme varem loonud"}</p>
   </div>
   
-  <Grid columns={3} gap="var(--space-5)">
+  <Grid columns={3} gap="gap-5">
     {#each projects as project}
       <Card variant="animated-neutral">
         {#if project.photo}
diff --git a/src/routes/Student.svelte b/src/routes/Student.svelte
index 96e2516..c4e39fa 100644
--- a/src/routes/Student.svelte
+++ b/src/routes/Student.svelte
@@ -59,7 +59,7 @@
     <p class="text-xl text-gray-600">{$text["benefits"]?.subtitle || "Siin on mõned põhjused, miks meie kogukond on suurepärane koht arenguks"}</p>
   </div>
   
-  <Grid columns={3} gap="var(--space-5)">
+  <Grid columns={3} gap="gap-5">
     {#each benefits as benefit}
       <Card variant="glass">
         <div class="feature-icon mb-4" style="color: var(--orange)">
@@ -74,7 +74,7 @@
 
 <!-- What You'll Do Section -->
 <Section background="neutral">
-  <Grid gap="var(--space-5)">
+  <Grid gap="gap-5">
     <Card variant="glass">
       <h2 class="text-4xl font-bold mb-4">{$text["activities"]?.title || "Mida saad teha?"}</h2>
       <div class="space-y-4 text-lg">
