diff --git a/src/main/resources/templates/signup.html b/src/main/resources/templates/signup.html
index cdd1e15..7511569 100644
--- a/src/main/resources/templates/signup.html
+++ b/src/main/resources/templates/signup.html
@@ -1,51 +1,60 @@
 <!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" class="h-full bg-white">
     <head>
         <th:block th:insert="~{fragments/header}"></th:block>
-        <link rel="stylesheet" href="/static/css/util.css">
-        <link href="/static/css/sign-up.css" rel="stylesheet">
     </head>
-    <body class="d-flex align-items-center py-4 bg-body-tertiary">
-        <div th:replace="~{fragments/floating_button}"></div>
+    <body class="h-full">
+        <div th:if="${param.error}">
+            <div role="alert" class="rounded border-s-4 border-red-500 bg-red-50 p-4">
+                <p class="mt-2 text-sm text-red-700" th:text="#{incorcred}"></p>
+            </div>
+        </div>
 
-        <main class="form-signup w-100 m-auto">
-            <div th:if="${param.error}">
-                <div class="alert alert-danger" role="alert" th:text="#{incorcred}">
-
-                </div>
+        <div th:if="${error}">
+            <div role="alert" class="rounded border-s-4 border-red-500 bg-red-50 p-4">
+                <p class="mt-2 text-sm text-red-700" th:text="#{incorcred}"></p>
+            </div>
+        </div>
+        <div class="flex min-h-full flex-col justify-center px-6 py-12 lg:px-8">
+            <div class="sm:mx-auto sm:w-full sm:max-w-sm">
+                <h2 class="mt-10 text-center text-2xl font-bold leading-9 tracking-tight text-gray-900" th:text="#{signup}"></h2>
             </div>
 
-            <div th:if="${error}">
-                <div class="alert alert-danger" role="alert" th:text="#{incorcred}">
+            <div class="mt-10 sm:mx-auto sm:w-full sm:max-w-sm">
+                <form class="space-y-6" th:action="@{/signup}" th:object="${user}" method="POST">
+                    <div>
+                        <label for="username" class="block text-sm font-medium leading-6 text-gray-900" th:text="#{nname}"></label>
+                        <div class="mt-2">
+                            <input id="username" name="username" type="text" required class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6">
+                        </div>
+                    </div>
 
-                </div>
+                    <div>
+                        <label for="password" class="block text-sm font-medium leading-6 text-gray-900" th:text="#{pass}"></label>
+                        <div class="mt-2">
+                            <input id="password" name="password" type="password" autocomplete="current-password" required class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6">
+                        </div>
+                    </div>
+
+                    <div>
+                        <label for="floatingInvite" class="block text-sm font-medium leading-6 text-gray-900" th:text="#{invitecode}"></label>
+                        <div class="mt-2">
+                            <input id="floatingInvite" name="invite_code" type="text" required class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6">
+                        </div>
+                    </div>
+
+                    <div>
+                        <button type="submit" class="flex w-full justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600" th:text="#{signup}"></button>
+                    </div>
+                </form>
+
+                <p class="mt-10 text-center text-sm text-gray-500">
+                    <a th:href="@{/login}" class="font-semibold leading-6 text-indigo-600 hover:text-indigo-500" th:text="#{signin}"></a>
+                </p>
+
+                <p class="mt-10 text-center text-sm text-gray-500">&copy; alterdekim 2023-2024</p>
             </div>
-
-            <form method="post" th:action="@{/signup}" th:object="${user}">
-                <h1 class="h3 mb-3 fw-normal" th:text="#{signup}"></h1>
-
-                <div class="form-floating">
-                    <input type="text" name="username" class="form-control" id="floatingInput" placeholder="Username">
-                    <label for="floatingInput" th:text="#{nname}"></label>
-                </div>
-
-                <div class="form-floating mt-1">
-                    <input type="password" name="password" class="form-control" id="floatingPassword" placeholder="Password">
-                    <label for="floatingPassword" th:text="#{pass}"></label>
-                </div>
-
-                <div class="form-floating mt-1">
-                    <input type="text" name="invite_code" class="form-control" id="floatingInvite" placeholder="Invite code">
-                    <label for="floatingInvite" th:text="#{invitecode}"></label>
-                </div>
-
-                <button class="btn btn-primary w-100 py-2 mt-3" type="submit" th:text="#{signup}"></button>
-
-                <p class="mt-3"><a th:href="@{/login}" class="link-primary" th:text="#{signin}"></a></p>
-
-                <p class="mb-3 text-body-secondary">&copy; alterdekim 2023</p>
-            </form>
-        </main>
+        </div>
         <div th:replace="~{fragments/footer :: div}"></div>
     </body>
 </html>
\ No newline at end of file
