diff --git a/internal/view/static/css/main.css b/internal/view/static/css/main.css
new file mode 100644
index 0000000..5efdd25
--- /dev/null
+++ b/internal/view/static/css/main.css
@@ -0,0 +1,7 @@
+@import "./partials/tailwind.css";
+@import "./partials/alpine.css";
+@import "./partials/general.css";
+@import "./partials/glucide.css";
+@import "./partials/htmx.css";
+@import "./partials/slim-select.css";
+@import "./partials/scrollbar.css";
\ No newline at end of file
diff --git a/internal/view/static/css/partials/alpine.css b/internal/view/static/css/partials/alpine.css
new file mode 100644
index 0000000..53be86c
--- /dev/null
+++ b/internal/view/static/css/partials/alpine.css
@@ -0,0 +1,3 @@
+[x-cloak] {
+  display: none !important;
+}
\ No newline at end of file
diff --git a/internal/view/static/css/partials/general.css b/internal/view/static/css/partials/general.css
new file mode 100644
index 0000000..45e9223
--- /dev/null
+++ b/internal/view/static/css/partials/general.css
@@ -0,0 +1,4 @@
+html {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
\ No newline at end of file
diff --git a/internal/view/static/css/partials/glucide.css b/internal/view/static/css/partials/glucide.css
new file mode 100644
index 0000000..093fc90
--- /dev/null
+++ b/internal/view/static/css/partials/glucide.css
@@ -0,0 +1,3 @@
+svg[data-glucide="icon"]:not([class*="size-"]) {
+  @apply size-4;
+}
\ No newline at end of file
diff --git a/internal/view/static/css/partials/htmx.css b/internal/view/static/css/partials/htmx.css
new file mode 100644
index 0000000..7c441d0
--- /dev/null
+++ b/internal/view/static/css/partials/htmx.css
@@ -0,0 +1,11 @@
+.htmx-indicator {
+  display: none;
+}
+
+.htmx-request .htmx-indicator {
+  display: block;
+}
+
+.htmx-request.htmx-indicator {
+  display: block;
+}
\ No newline at end of file
diff --git a/internal/view/static/css/partials/scrollbar.css b/internal/view/static/css/partials/scrollbar.css
new file mode 100644
index 0000000..41fb7a5
--- /dev/null
+++ b/internal/view/static/css/partials/scrollbar.css
@@ -0,0 +1,23 @@
+*,
+*:hover {
+  /* Reset scrollbar*/
+  scrollbar-color: auto;
+}
+
+*::-webkit-scrollbar {
+  -webkit-appearance: none;
+  width: 6px;
+  height: 6px;
+}
+
+*::-webkit-scrollbar-thumb {
+  @apply bg-gray-500;
+  border-radius: 3px;
+}
+
+/* Fallback scrollbar style for Firefox */
+@-moz-document url-prefix() {
+  * {
+    scrollbar-width: thin;
+  }
+}
\ No newline at end of file
diff --git a/internal/view/static/css/slim-select.css b/internal/view/static/css/partials/slim-select.css
similarity index 100%
rename from internal/view/static/css/slim-select.css
rename to internal/view/static/css/partials/slim-select.css
diff --git a/internal/view/static/css/partials/tailwind.css b/internal/view/static/css/partials/tailwind.css
new file mode 100644
index 0000000..adbf45b
--- /dev/null
+++ b/internal/view/static/css/partials/tailwind.css
@@ -0,0 +1,4 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+@tailwind variants;
\ No newline at end of file
diff --git a/internal/view/static/css/tailwind.css b/internal/view/static/css/tailwind.css
deleted file mode 100644
index 6d0cfcf..0000000
--- a/internal/view/static/css/tailwind.css
+++ /dev/null
@@ -1,59 +0,0 @@
-@import "./slim-select.css";
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-/* General */
-html {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-/* Custom scrollbar */
-*,
-*:hover {
-  /* Reset scrollbar*/
-  scrollbar-color: auto;
-}
-
-*::-webkit-scrollbar {
-  -webkit-appearance: none;
-  width: 6px;
-  height: 6px;
-}
-
-*::-webkit-scrollbar-thumb {
-  @apply bg-gray-500;
-  border-radius: 3px;
-}
-
-@-moz-document url-prefix() {
-  * {
-    /* Fallback scrollbar style for Firefox */
-    scrollbar-width: thin;
-  }
-}
-
-/* For AlpineJS */
-[x-cloak] {
-  display: none !important;
-}
-
-/* For HTMX */
-.htmx-indicator {
-  display: none;
-}
-
-.htmx-request .htmx-indicator {
-  display: block;
-}
-
-.htmx-request.htmx-indicator {
-  display: block;
-}
-
-/* For Gomponents Lucide */
-svg[data-glucide="icon"]:not([class*="size-"]) {
-  @apply size-4;
-}
\ No newline at end of file
diff --git a/taskfile.yaml b/taskfile.yaml
index d4c3527..bfad525 100644
--- a/taskfile.yaml
+++ b/taskfile.yaml
@@ -50,7 +50,7 @@ tasks:
     cmd: >
       npm run tailwindcss --
       --config ./tailwind.config.js
-      --input ./internal/view/static/css/tailwind.css
+      --input ./internal/view/static/css/main.css
       --output ./internal/view/static/css/style.css --minify
 
   tidy: