diff --git a/app/src/main/res/layout/activity_account_created.xml b/app/src/main/res/layout/activity_account_created.xml
index 1f6af6d..49e5e99 100644
--- a/app/src/main/res/layout/activity_account_created.xml
+++ b/app/src/main/res/layout/activity_account_created.xml
@@ -5,30 +5,33 @@
     android:id="@+id/accountCreatedRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".AccountCreatedActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardAccountCreated"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginEnd="24dp"
         android:layout_marginTop="32dp"
-        app:cardBackgroundColor="#FFFFFF"
-        app:cardCornerRadius="18dp"
-        app:cardElevation="4dp"
+        app:cardBackgroundColor="@color/colorSurface"
+        app:cardCornerRadius="20dp"
+        app:cardElevation="6dp"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
@@ -37,24 +40,24 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="24dp">
+            android:padding="32dp">
 
             <TextView
                 android:id="@+id/txtCongrats"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Conta criada!"
-                android:textColor="#000"
-                android:textSize="22sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="26sp"
+                android:fontFamily="sans-serif-medium" />
 
             <TextView
                 android:id="@+id/txtWelcome"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
+                android:layout_marginTop="12dp"
                 android:text="Nome"
-                android:textColor="#4D4D4D"
+                android:textColor="@color/colorTextSecondary"
                 android:textSize="16sp" />
 
             <TextView
@@ -63,18 +66,24 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text="email@example.com"
-                android:textColor="#4D4D4D"
+                android:textColor="@color/colorTextSecondary"
                 android:textSize="14sp" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="20dp"
+                android:background="@color/colorDivider" />
+
             <TextView
                 android:id="@+id/txtRoleLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="20dp"
                 android:text="Função atribuída:"
-                android:textColor="#000"
+                android:textColor="@color/colorTextPrimary"
                 android:textSize="15sp"
-                android:textStyle="bold" />
+                android:fontFamily="sans-serif-medium" />
 
             <TextView
                 android:id="@+id/txtRole"
@@ -82,30 +91,33 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text="ADMIN"
-                android:textColor="#2E7D32"
-                android:textSize="14sp" />
+                android:textColor="@color/colorSuccess"
+                android:textSize="14sp"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/txtInstructions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="20dp"
                 android:text="Vamos configurar o seu espaço. Pode aceder à sua área agora."
-                android:textColor="#4D4D4D"
-                android:textSize="14sp" />
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="14sp"
+                android:lineSpacingExtra="4dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnContinuar"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/btn_primary"
+                android:layout_height="56dp"
+                android:layout_marginTop="32dp"
+                app:cornerRadius="14dp"
+                app:backgroundTint="@color/colorPrimary"
                 android:text="Ir para a minha área"
                 android:textAllCaps="false"
-                android:textColor="#FFFFFF" />
+                android:textColor="@color/white"
+                android:textSize="16sp" />
 
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/app/src/main/res/layout/activity_add_staff.xml b/app/src/main/res/layout/activity_add_staff.xml
index 8faf208..be2fff6 100644
--- a/app/src/main/res/layout/activity_add_staff.xml
+++ b/app/src/main/res/layout/activity_add_staff.xml
@@ -5,20 +5,19 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".AddStaffActivity">
 
-    <!-- Top Bar with Back Button -->
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltarAddStaff"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:background="@android:color/transparent"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
-        android:textColor="#FF5252"
+        android:textColor="@color/colorError"
         android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -29,123 +28,137 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:text="Novo Funcionário"
-        android:textColor="#000"
-        android:textSize="24sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnVoltarAddStaff" />
 
     <TextView
         android:id="@+id/txtAdicionarDesc"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="8dp"
         android:text="Introduza os dados e atribuições deste membro:"
-        android:textColor="#666666"
+        android:textColor="@color/colorTextSecondary"
+        android:textAlignment="center"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/txtAdicionarTitulo" />
 
-    <LinearLayout
+    <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
         android:layout_marginTop="32dp"
-        android:background="#FFFFFF"
-        android:elevation="2dp"
-        android:orientation="vertical"
-        android:padding="20dp"
+        app:cardCornerRadius="20dp"
+        app:cardElevation="2dp"
+        app:cardBackgroundColor="@color/colorSurface"
         app:layout_constraintTop_toBottomOf="@id/txtAdicionarDesc">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Nome do Funcionário"
-            android:textColor="#333"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <EditText
-            android:id="@+id/nammeEditText"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/input_bg"
-            android:hint="Ex: João Silva"
-            android:inputType="textPersonName"
-            android:paddingHorizontal="16dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:text="Zona de Trabalho"
-            android:textColor="#333"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
         <LinearLayout
-            android:id="@+id/zoneLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
+            android:orientation="vertical"
+            android:padding="24dp">
 
-            <Spinner
-                android:id="@+id/zonaSpinner"
-                android:layout_width="0dp"
-                android:layout_height="50dp"
-                android:layout_weight="1"
-                android:background="@drawable/input_bg" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Nome do Funcionário"
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="15sp"
+                android:fontFamily="sans-serif-medium" />
 
-            <Button
-                android:id="@+id/btnAddZone"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/btn_primary"
-                android:text="+"
-                android:textColor="#FFFFFF"
-                android:textSize="20sp" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:text="Mesa a Atribuir"
-            android:textColor="#333"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-        <LinearLayout
-            android:id="@+id/mesaLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal">
-
-            <Spinner
-                android:id="@+id/mesaSpinner"
+            <EditText
+                android:id="@+id/nammeEditText"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:background="@drawable/input_bg" />
-        </LinearLayout>
+                android:layout_height="54dp"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/input_bg"
+                android:hint="Ex: João Silva"
+                android:inputType="textPersonName"
+                android:paddingHorizontal="16dp"
+                android:textColor="@color/colorTextPrimary" />
 
-        <Button
-            android:id="@+id/addButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="32dp"
-            android:background="@drawable/btn_primary"
-            android:text="Adicionar Membro"
-            android:textAllCaps="false"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-    </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="Zona de Trabalho"
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="15sp"
+                android:fontFamily="sans-serif-medium" />
+
+            <LinearLayout
+                android:id="@+id/zoneLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <Spinner
+                    android:id="@+id/zonaSpinner"
+                    android:layout_width="0dp"
+                    android:layout_height="54dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/input_bg" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnAddZone"
+                    android:layout_width="54dp"
+                    android:layout_height="54dp"
+                    android:layout_marginStart="12dp"
+                    app:cornerRadius="12dp"
+                    app:backgroundTint="@color/colorPrimary"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:paddingTop="0dp"
+                    android:paddingBottom="0dp"
+                    android:text="+"
+                    android:textColor="@color/white"
+                    android:textSize="24sp" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:text="Mesa a Atribuir"
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="15sp"
+                android:fontFamily="sans-serif-medium" />
+
+            <LinearLayout
+                android:id="@+id/mesaLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal">
+
+                <Spinner
+                    android:id="@+id/mesaSpinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="54dp"
+                    android:background="@drawable/input_bg" />
+            </LinearLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/addButton"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:layout_marginTop="36dp"
+                app:cornerRadius="14dp"
+                app:backgroundTint="@color/colorPrimary"
+                android:text="Adicionar Membro"
+                android:textAllCaps="false"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_checkin_antecipado.xml b/app/src/main/res/layout/activity_checkin_antecipado.xml
index e8dcbf9..1b8d659 100644
--- a/app/src/main/res/layout/activity_checkin_antecipado.xml
+++ b/app/src/main/res/layout/activity_checkin_antecipado.xml
@@ -5,17 +5,20 @@
     android:id="@+id/checkinRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".CheckInAntecipadoActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,23 +27,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Check-in antecipado"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/txtDescricaoCheckin"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="12dp"
         android:text="Aqui poderá confirmar a sua chegada ao restaurante."
+        android:textColor="@color/colorTextSecondary"
         android:textSize="14sp"
-        android:textColor="#4D4D4D"
+        android:textAlignment="center"
         app:layout_constraintTop_toBottomOf="@id/txtTituloCheckin"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -49,11 +53,11 @@
         android:id="@+id/txtDistancia"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="40dp"
         android:text="A calcular distância..."
-        android:textSize="18sp"
-        android:textColor="#2E7D32"
-        android:textStyle="bold"
+        android:textColor="@color/colorPrimary"
+        android:textSize="20sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/txtDescricaoCheckin"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -64,11 +68,11 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="32dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="12dp"
         android:text="Por favor, aguarde enquanto validamos a sua localização."
         android:textAlignment="center"
+        android:textColor="@color/colorTextSecondary"
         android:textSize="14sp"
-        android:textColor="#5F5F5F"
         app:layout_constraintTop_toBottomOf="@id/txtDistancia"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -78,35 +82,41 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="32dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:text="A carregar morada..."
         android:textAlignment="center"
-        android:textSize="14sp"
-        android:textColor="#333"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="15sp"
+        android:textStyle="italic"
         app:layout_constraintTop_toBottomOf="@id/txtStatusDistancia"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnAbrirMapa"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="Ver no Mapa"
         android:textAllCaps="false"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:textColor="@color/colorPrimary"
         app:layout_constraintTop_toBottomOf="@id/txtEnderecoRestaurante"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnConfirmarChegada"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="56dp"
         android:layout_marginHorizontal="32dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="32dp"
+        app:cornerRadius="14dp"
+        app:backgroundTint="@color/colorSuccess"
         android:text="Confirmar Chegada"
         android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="16sp"
         android:enabled="false"
         app:layout_constraintTop_toBottomOf="@id/btnAbrirMapa"
         app:layout_constraintStart_toStartOf="parent"
@@ -114,8 +124,3 @@
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_client_dashboard.xml b/app/src/main/res/layout/activity_client_dashboard.xml
index 01b8330..1f973fc 100644
--- a/app/src/main/res/layout/activity_client_dashboard.xml
+++ b/app/src/main/res/layout/activity_client_dashboard.xml
@@ -5,17 +5,17 @@
     android:id="@+id/clientRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFFFFF"
+    android:background="@color/colorBackground"
     tools:context=".ClientDashboardActivity">
 
     <!-- Top Bar with Profile Icon -->
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardProfile"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
-        app:cardCornerRadius="22.5dp"
+        app:cardCornerRadius="25dp"
         app:cardElevation="2dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -26,7 +26,7 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             android:src="@drawable/circle_bg" />
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
         android:id="@+id/txtClientGreeting"
@@ -34,22 +34,22 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:text="Olá, convidado"
-        android:textColor="#000"
-        android:textSize="20sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="22sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintBottom_toBottomOf="@id/cardProfile"
         app:layout_constraintStart_toEndOf="@id/cardProfile"
         app:layout_constraintTop_toTopOf="@id/cardProfile" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:text="Sair"
         android:textAllCaps="false"
-        android:background="@android:color/transparent"
-        android:textColor="#FF5252"
+        android:textColor="@color/colorError"
         app:layout_constraintBottom_toBottomOf="@id/cardProfile"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/cardProfile" />
@@ -58,8 +58,9 @@
         android:id="@+id/clientScroll"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:fillViewport="true"
+        android:scrollbars="none"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -69,18 +70,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="24dp">
+            android:paddingBottom="40dp">
 
             <!-- Categories Section -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:layout_marginTop="16dp"
                 android:text="Categorias"
-                android:textColor="#000"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="20sp"
+                android:fontFamily="sans-serif-medium" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvCategories"
@@ -99,27 +99,27 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="32dp"
                 android:text="A sua próxima reserva"
-                android:textColor="#000"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="20sp"
+                android:fontFamily="sans-serif-medium" />
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/cardNextReservation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="12dp"
-                app:cardBackgroundColor="#F8F9FA"
-                app:cardCornerRadius="20dp"
-                app:cardElevation="0dp">
+                android:layout_marginTop="16dp"
+                app:cardBackgroundColor="@color/colorSurface"
+                app:cardCornerRadius="24dp"
+                app:cardElevation="6dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="20dp">
+                    android:padding="24dp">
 
                     <RelativeLayout
                         android:layout_width="match_parent"
@@ -130,92 +130,94 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="Sabor &amp; Arte"
-                            android:textColor="#000"
-                            android:textSize="18sp"
-                            android:textStyle="bold" />
+                            android:textColor="@color/colorTextPrimary"
+                            android:textSize="20sp"
+                            android:fontFamily="sans-serif-medium" />
 
                         <TextView
                             android:id="@+id/txtResTime"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_below="@id/txtResTitle"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="6dp"
                             android:text="Amanhã às 20h00 • 2 pessoas"
-                            android:textColor="#616161"
-                            android:textSize="14sp" />
+                            android:textColor="@color/colorTextSecondary"
+                            android:textSize="15sp" />
 
                         <ImageView
                             android:id="@+id/imgResIcon"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
+                            android:layout_width="56dp"
+                            android:layout_height="56dp"
                             android:layout_alignParentEnd="true"
                             android:src="@drawable/circle_bg"
-                            app:tint="#0066CC" />
+                            app:tint="@color/colorPrimary" />
                     </RelativeLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:layout_marginVertical="16dp"
-                        android:background="#E0E0E0" />
+                        android:layout_marginVertical="20dp"
+                        android:background="@color/colorDivider" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <Button
+                        <com.google.android.material.button.MaterialButton
                             android:id="@+id/btnCheckIn"
                             android:layout_width="0dp"
-                            android:layout_height="45dp"
-                            android:layout_marginEnd="6dp"
+                            android:layout_height="54dp"
+                            android:layout_marginEnd="8dp"
                             android:layout_weight="1"
-                            android:background="@drawable/btn_primary"
+                            app:cornerRadius="14dp"
+                            app:backgroundTint="@color/colorPrimary"
                             android:text="Check-in"
                             android:textAllCaps="false"
-                            android:textColor="#FFF"
-                            android:textSize="14sp" />
+                            android:textColor="@color/white"
+                            android:textSize="15sp" />
 
-                        <Button
+                        <com.google.android.material.button.MaterialButton
                             android:id="@+id/btnPartilhar"
+                            style="@style/Widget.Material3.Button.TonalButton"
                             android:layout_width="0dp"
-                            android:layout_height="45dp"
-                            android:layout_marginStart="6dp"
+                            android:layout_height="54dp"
+                            android:layout_marginStart="8dp"
                             android:layout_weight="1"
-                            android:background="@drawable/btn_light_border"
+                            app:cornerRadius="14dp"
                             android:text="Partilhar"
                             android:textAllCaps="false"
-                            android:textColor="#000"
-                            android:textSize="14sp" />
+                            android:textSize="15sp" />
                     </LinearLayout>
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
             <!-- Actions Section -->
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="40dp"
                 android:text="Mais opções"
-                android:textColor="#000"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="20sp"
+                android:fontFamily="sans-serif-medium" />
 
             <GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="16dp"
                 android:columnCount="1">
 
-                <androidx.cardview.widget.CardView
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/cardNewRes"
                     android:layout_width="match_parent"
-                    android:layout_height="100dp"
+                    android:layout_height="90dp"
                     android:layout_margin="8dp"
                     app:cardCornerRadius="16dp"
-                    app:cardElevation="2dp">
+                    app:cardElevation="2dp"
+                    app:cardBackgroundColor="@color/colorSurface">
                     <LinearLayout
                         android:id="@+id/btnNovaReserva"
                         android:layout_width="match_parent"
@@ -227,19 +229,20 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="Reservar"
-                            android:textColor="#000"
+                            android:textColor="@color/colorTextPrimary"
                             android:textSize="18sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="sans-serif-medium" />
                     </LinearLayout>
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
-                <androidx.cardview.widget.CardView
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/cardMinhasReservas"
                     android:layout_width="match_parent"
-                    android:layout_height="100dp"
+                    android:layout_height="90dp"
                     android:layout_margin="8dp"
                     app:cardCornerRadius="16dp"
-                    app:cardElevation="2dp">
+                    app:cardElevation="2dp"
+                    app:cardBackgroundColor="@color/colorSurface">
                     <LinearLayout
                         android:id="@+id/btnMinhasReservas"
                         android:layout_width="match_parent"
@@ -251,11 +254,11 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="Minhas Reservas"
-                            android:textColor="#000"
+                            android:textColor="@color/colorTextPrimary"
                             android:textSize="18sp"
-                            android:textStyle="bold" />
+                            android:fontFamily="sans-serif-medium" />
                     </LinearLayout>
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
             </GridLayout>
 
@@ -264,12 +267,12 @@
                 android:id="@+id/txtClientStatus"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="24dp"
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginTop="40dp"
                 android:text="Tudo pronto para a sua próxima refeição!"
                 android:textAlignment="center"
-                android:textColor="#757575"
-                android:textSize="14sp" />
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/txtClientRole"
@@ -278,12 +281,10 @@
                 android:layout_gravity="center"
                 android:layout_marginTop="8dp"
                 android:text="Modo Cliente"
-                android:textColor="#BDBDBD"
+                android:textColor="#94A3B8"
                 android:textSize="12sp" />
 
         </LinearLayout>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
diff --git a/app/src/main/res/layout/activity_definicoes_admin.xml b/app/src/main/res/layout/activity_definicoes_admin.xml
index 827eeaf..74ea0c8 100644
--- a/app/src/main/res/layout/activity_definicoes_admin.xml
+++ b/app/src/main/res/layout/activity_definicoes_admin.xml
@@ -5,18 +5,20 @@
     android:id="@+id/definicoesRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F2F2F2"
+    android:background="@color/colorBackground"
     tools:context=".DefinicoesAdminActivity">
 
-
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,6 +26,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:fillViewport="true"
+        android:scrollbars="none"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,122 +36,139 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="24dp">
+            android:paddingHorizontal="24dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="48dp">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Definições do Estabelecimento"
-                android:textColor="#000"
-                android:textSize="24sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="28sp"
+                android:fontFamily="sans-serif-medium"
+                android:textAlignment="center" />
 
-            <ImageView
-                android:id="@+id/imgRestaurantLogo"
+            <!-- Improved Logo using MaterialCardView -->
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="120dp"
                 android:layout_height="120dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="24dp"
-                android:src="@android:drawable/ic_menu_gallery"
-                android:background="#E0E0E0" />
+                android:layout_marginTop="32dp"
+                app:cardCornerRadius="60dp"
+                app:cardElevation="2dp"
+                app:strokeWidth="1dp"
+                app:strokeColor="@color/colorDivider">
+                <ImageView
+                    android:id="@+id/imgRestaurantLogo"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/circle_bg" />
+            </com.google.android.material.card.MaterialCardView>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnChangeLogo"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="16dp"
                 android:text="Alterar Logótipo"
-                android:textAllCaps="false"
-                android:backgroundTint="#2E7D32"
-                android:textColor="#FFFFFF" />
+                android:textAllCaps="false" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:text="Configure o raio de segurança para check-in antecipado."
-                android:textColor="#5F5F5F"
+                android:layout_marginTop="24dp"
+                android:text="Configure o raio de segurança para check-in antecipado e regras associadas."
+                android:textColor="@color/colorTextSecondary"
+                android:textAlignment="center"
                 android:textSize="14sp" />
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
-                app:cardBackgroundColor="#FFFFFF"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="3dp">
+                app:cardBackgroundColor="@color/colorSurface"
+                app:cardCornerRadius="20dp"
+                app:cardElevation="2dp"
+                app:strokeWidth="1dp"
+                app:strokeColor="@color/colorDivider">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="20dp">
+                    android:padding="24dp">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="Raio de Segurança (metros)"
-                        android:textColor="#000"
+                        android:textColor="@color/colorTextPrimary"
                         android:textSize="16sp"
-                        android:textStyle="bold" />
+                        android:fontFamily="sans-serif-medium" />
 
                     <EditText
                         android:id="@+id/inputRadius"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
                         android:hint="Ex: 500"
                         android:inputType="number"
-                        android:padding="12dp"
-                        android:background="@android:drawable/editbox_background_normal" />
+                        android:paddingHorizontal="16dp"
+                        android:background="@drawable/input_bg"
+                        android:textColor="@color/colorTextPrimary" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:text="Informação do Restaurante"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
+
+                    <EditText
+                        android:id="@+id/inputAddress"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        android:hint="Morada (Ex: Rua Estreita, 12)"
+                        android:inputType="textPostalAddress"
+                        android:paddingHorizontal="16dp"
+                        android:background="@drawable/input_bg"
+                        android:textColor="@color/colorTextPrimary" />
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="20dp"
-                        android:text="Informação do Restaurante"
-                        android:textColor="#000"
-                        android:textSize="16sp"
-                        android:textStyle="bold" />
-
-                    <EditText
-                        android:id="@+id/inputAddress"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:hint="Morada (Ex: Rua Estreita, 12)"
-                        android:inputType="textPostalAddress"
-                        android:padding="12dp"
-                        android:background="@android:drawable/editbox_background_normal" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
                         android:text="Categoria"
-                        android:textColor="#5F5F5F"
-                        android:textSize="14sp" />
+                        android:textColor="@color/colorTextSecondary"
+                        android:textSize="15sp" />
 
                     <Spinner
                         android:id="@+id/spinnerCategory"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:minHeight="48dp" />
+                        android:layout_height="54dp"
+                        android:layout_marginTop="8dp"
+                        android:background="@drawable/input_bg" />
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/btnSaveSettings"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="24dp"
-                        android:background="@drawable/btn_light"
+                        android:layout_height="56dp"
+                        android:layout_marginTop="32dp"
+                        app:cornerRadius="14dp"
+                        app:backgroundTint="@color/colorPrimary"
                         android:text="Guardar Definições"
                         android:textAllCaps="false"
-                        android:textColor="#00001A" />
+                        android:textSize="16sp" />
 
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_detalhes_reservas.xml b/app/src/main/res/layout/activity_detalhes_reservas.xml
index ffb9d06..485e326 100644
--- a/app/src/main/res/layout/activity_detalhes_reservas.xml
+++ b/app/src/main/res/layout/activity_detalhes_reservas.xml
@@ -5,17 +5,20 @@
     android:id="@+id/detalhesReservasRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".DetalhesReservasActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,23 +27,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Detalhes das reservas"
-        android:textColor="#000"
-        android:textSize="22sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="26sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
-        android:layout_marginTop="24dp" />
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/txtDescricaoDetalhes"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="8dp"
         android:text="Selecione uma reserva para ver os detalhes e atualizar o estado."
-        android:textColor="#4D4D4D"
+        android:textColor="@color/colorTextSecondary"
         android:textSize="14sp"
+        android:textAlignment="center"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/txtTituloDetalhes" />
@@ -49,26 +53,31 @@
         android:id="@+id/listReservas"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"
-        android:divider="#E0E0E0"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="16dp"
+        android:divider="@color/colorDivider"
         android:dividerHeight="1dp"
+        android:scrollbars="none"
+        android:clipToPadding="false"
         app:layout_constraintTop_toBottomOf="@id/txtDescricaoDetalhes"
         app:layout_constraintBottom_toTopOf="@id/cardDetalhes"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardDetalhes"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        app:cardBackgroundColor="#FFFFFF"
-        app:cardCornerRadius="16dp"
-        app:cardElevation="4dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="32dp"
+        app:cardBackgroundColor="@color/colorSurface"
+        app:cardCornerRadius="20dp"
+        app:cardElevation="10dp"
+        app:strokeWidth="1dp"
+        app:strokeColor="@color/colorDivider"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
@@ -77,15 +86,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="24dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Reserva selecionada"
-                android:textColor="#000"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="18sp"
+                android:fontFamily="sans-serif-medium" />
 
             <TextView
                 android:id="@+id/txtReservaInfo"
@@ -93,8 +102,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:text="Selecione uma reserva"
-                android:textColor="#4D4D4D"
-                android:textSize="14sp" />
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/txtReservaNotas"
@@ -102,57 +111,61 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text=""
-                android:textColor="#4D4D4D"
+                android:textColor="@color/colorTextSecondary"
                 android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/txtReservaEstado"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
+                android:layout_marginTop="8dp"
                 android:text="Estado:"
-                android:textColor="#2E7D32"
+                android:textColor="@color/colorSuccess"
                 android:textSize="14sp"
                 android:textStyle="bold" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="20dp"
                 android:orientation="horizontal">
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnConfirmarReserva"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="54dp"
                     android:layout_marginEnd="4dp"
                     android:layout_weight="1"
-                    android:background="@drawable/btn_primary"
+                    app:cornerRadius="12dp"
+                    app:backgroundTint="@color/colorPrimary"
                     android:text="Confirmar"
                     android:textAllCaps="false"
-                    android:textColor="#FFFFFF" />
+                    android:textColor="@color/white" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnCancelarReserva"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="54dp"
                     android:layout_marginHorizontal="4dp"
                     android:layout_weight="1"
-                    android:background="@drawable/btn_light_border"
+                    app:cornerRadius="12dp"
                     android:text="Recusar"
                     android:textAllCaps="false"
-                    android:textColor="#00001A" />
+                    android:textColor="@color/colorTextPrimary" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnApagarReserva"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="54dp"
                     android:layout_marginStart="4dp"
                     android:layout_weight="1"
-                    android:background="@drawable/btn_light_border"
+                    app:cornerRadius="12dp"
+                    app:strokeColor="@color/colorError"
                     android:text="Apagar"
                     android:textAllCaps="false"
-                    android:textColor="#C62828"
+                    android:textColor="@color/colorError"
                     android:visibility="gone" />
             </LinearLayout>
 
@@ -160,21 +173,11 @@
                 android:id="@+id/txtMensagemReserva"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="12dp"
                 android:text=""
-                android:textColor="#2E7D32"
-                android:textSize="13sp" />
+                android:textColor="@color/colorSuccess"
+                android:textSize="14sp" />
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_establishment_dashboard.xml b/app/src/main/res/layout/activity_establishment_dashboard.xml
index b461873..913f8c3 100644
--- a/app/src/main/res/layout/activity_establishment_dashboard.xml
+++ b/app/src/main/res/layout/activity_establishment_dashboard.xml
@@ -5,17 +5,20 @@
     android:id="@+id/establishmentRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F2F2F2"
+    android:background="@color/colorBackground"
     tools:context=".EstablishmentDashboardActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -23,6 +26,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:fillViewport="true"
+        android:scrollbars="none"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,45 +43,46 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Estabelecimento"
-                android:textColor="#000"
-                android:textSize="24sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="28sp"
+                android:fontFamily="sans-serif-medium" />
 
             <TextView
                 android:id="@+id/txtEstabSubtitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
+                android:layout_marginTop="8dp"
                 android:text="Veja as reservas ao vivo e controle a ocupação."
-                android:textColor="#5F5F5F"
-                android:textSize="14sp" />
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="15sp"
+                android:lineSpacingExtra="2dp"/>
 
             <TextView
                 android:id="@+id/txtEstabRole"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
+                android:layout_marginTop="8dp"
                 android:text="Função: ADMIN"
-                android:textColor="#2E7D32"
+                android:textColor="@color/colorSuccess"
                 android:textSize="13sp"
                 android:textStyle="bold" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="32dp"
                 android:orientation="horizontal">
 
-                <androidx.cardview.widget.CardView
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/cardReservasHoje"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginEnd="6dp"
                     android:layout_weight="1"
                     android:foreground="?attr/selectableItemBackground"
-                    app:cardBackgroundColor="#FFFFFF"
+                    app:cardBackgroundColor="@color/colorSurface"
                     app:cardCornerRadius="16dp"
-                    app:cardElevation="3dp">
+                    app:cardElevation="2dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -89,31 +94,31 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Reservas de hoje"
-                            android:textColor="#5F5F5F"
-                            android:textSize="12sp" />
+                            android:text="Reservas"
+                            android:textColor="@color/colorTextSecondary"
+                            android:textSize="13sp" />
 
                         <TextView
                             android:id="@+id/txtReservasHojeDash"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="6dp"
                             android:text="00"
-                            android:textColor="#000"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
+                            android:textColor="@color/colorPrimary"
+                            android:textSize="30sp"
+                            android:fontFamily="sans-serif-medium" />
                     </LinearLayout>
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
-                <androidx.cardview.widget.CardView
+                <com.google.android.material.card.MaterialCardView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginEnd="6dp"
                     android:layout_weight="1"
-                    app:cardBackgroundColor="#FFFFFF"
+                    app:cardBackgroundColor="@color/colorSurface"
                     app:cardCornerRadius="16dp"
-                    app:cardElevation="3dp">
+                    app:cardElevation="2dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -125,30 +130,30 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Mesas livres"
-                            android:textColor="#5F5F5F"
-                            android:textSize="12sp" />
+                            android:text="Mesas"
+                            android:textColor="@color/colorTextSecondary"
+                            android:textSize="13sp" />
 
                         <TextView
                             android:id="@+id/txtMesasLivresDash"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="6dp"
                             android:text="00"
-                            android:textColor="#000"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
+                            android:textColor="@color/colorTextPrimary"
+                            android:textSize="30sp"
+                            android:fontFamily="sans-serif-medium" />
                     </LinearLayout>
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
-                <androidx.cardview.widget.CardView
+                <com.google.android.material.card.MaterialCardView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginStart="6dp"
                     android:layout_weight="1"
-                    app:cardBackgroundColor="#FFFFFF"
+                    app:cardBackgroundColor="@color/colorSurface"
                     app:cardCornerRadius="16dp"
-                    app:cardElevation="3dp">
+                    app:cardElevation="2dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -160,135 +165,138 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Lista de espera"
-                            android:textColor="#5F5F5F"
-                            android:textSize="12sp" />
+                            android:text="Espera"
+                            android:textColor="@color/colorTextSecondary"
+                            android:textSize="13sp" />
 
                         <TextView
                             android:id="@+id/txtListaEsperaDash"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="6dp"
                             android:text="00"
-                            android:textColor="#000"
-                            android:textSize="28sp"
-                            android:textStyle="bold" />
+                            android:textColor="@color/colorWarning"
+                            android:textSize="30sp"
+                            android:fontFamily="sans-serif-medium" />
                     </LinearLayout>
-                </androidx.cardview.widget.CardView>
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="40dp"
                 android:text="Próximas reservas"
-                android:textColor="#000"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="20sp"
+                android:fontFamily="sans-serif-medium" />
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                app:cardBackgroundColor="#FFFFFF"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="3dp">
+                android:layout_marginTop="16dp"
+                app:cardBackgroundColor="@color/colorSurface"
+                app:cardCornerRadius="20dp"
+                app:cardElevation="4dp">
 
                 <LinearLayout
                     android:id="@+id/llProximasReservas"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="18dp">
+                    android:padding="24dp">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="A procurar próximas reservas..."
-                        android:textColor="#5F5F5F"
-                        android:textSize="14sp" />
+                        android:textColor="@color/colorTextSecondary"
+                        android:textSize="15sp" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="40dp"
                 android:text="Operações rápidas"
-                android:textColor="#000"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="20sp"
+                android:fontFamily="sans-serif-medium" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="16dp"
                 android:orientation="vertical">
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnAbrirEspera"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="56dp"
                     android:layout_marginBottom="12dp"
-                    android:background="@drawable/btn_light"
+                    app:cornerRadius="14dp"
                     android:text="Abrir lista de espera"
                     android:textAllCaps="false"
-                    android:textColor="#00001A" />
+                    android:textSize="16sp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnGerirMesas"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="56dp"
                     android:layout_marginBottom="12dp"
-                    android:background="@drawable/btn_light_border"
+                    app:cornerRadius="14dp"
                     android:text="Editar mesas"
                     android:textAllCaps="false"
-                    android:textColor="#00001A" />
+                    android:textSize="16sp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnDetalhesReservas"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="56dp"
                     android:layout_marginBottom="12dp"
-                    android:background="@drawable/btn_light_border"
+                    app:cornerRadius="14dp"
                     android:text="Detalhes das reservas"
                     android:textAllCaps="false"
-                    android:textColor="#00001A" />
+                    android:textSize="16sp" />
 
-
-
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnGestaoStaff"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="56dp"
                     android:layout_marginBottom="12dp"
-                    android:background="@drawable/btn_light_border"
+                    app:cornerRadius="14dp"
                     android:text="Gestão de staff"
                     android:textAllCaps="false"
-                    android:textColor="#00001A" />
+                    android:textSize="16sp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnDefinicoes"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="12dp"
-                    android:background="@drawable/btn_light_border"
+                    android:layout_height="56dp"
+                    android:layout_marginBottom="24dp"
+                    app:cornerRadius="14dp"
                     android:text="Definições"
                     android:textAllCaps="false"
-                    android:textColor="#00001A" />
-
-
+                    android:textSize="16sp" />
 
             </LinearLayout>
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                app:cardBackgroundColor="#FFFFFF"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="3dp">
+                android:layout_marginBottom="24dp"
+                app:cardBackgroundColor="@color/colorSurface"
+                app:cardCornerRadius="20dp"
+                app:strokeWidth="1dp"
+                app:strokeColor="@color/colorWarning"
+                app:cardElevation="2dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -300,25 +308,22 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="Alertas operacionais"
-                        android:textColor="#000"
+                        android:textColor="@color/colorTextPrimary"
                         android:textSize="16sp"
-                        android:textStyle="bold" />
+                        android:fontFamily="sans-serif-medium" />
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:text="• Mesa 07 aguarda confirmação há 10 min\n• 2 clientes aguardam resposta no chat"
-                        android:textColor="#5F5F5F"
+                        android:textColor="@color/colorTextSecondary"
+                        android:lineSpacingExtra="4dp"
                         android:textSize="14sp" />
                 </LinearLayout>
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
 
         </LinearLayout>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
diff --git a/app/src/main/res/layout/activity_explorar_restaurantes.xml b/app/src/main/res/layout/activity_explorar_restaurantes.xml
index 6eec04a..c6d38df 100644
--- a/app/src/main/res/layout/activity_explorar_restaurantes.xml
+++ b/app/src/main/res/layout/activity_explorar_restaurantes.xml
@@ -5,17 +5,20 @@
     android:id="@+id/explorarRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".ExplorarRestaurantesActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,19 +27,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Explorar restaurantes"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvRestaurants"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:clipToPadding="false"
         android:paddingBottom="24dp"
         android:visibility="visible"
@@ -51,9 +54,10 @@
         android:id="@+id/scrollReservaDetails"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:fillViewport="true"
         android:visibility="gone"
+        android:scrollbars="none"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -63,126 +67,132 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="32dp">
+            android:paddingBottom="48dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingHorizontal="24dp"
-                android:layout_marginTop="16dp">
+                android:layout_marginTop="8dp">
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnVerAvaliacoes"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="54dp"
                     android:layout_weight="1"
                     android:layout_marginEnd="8dp"
+                    app:cornerRadius="12dp"
                     android:text="Avaliações"
                     android:textAllCaps="false"
-                    android:backgroundTint="#FFFFFF"
-                    android:textColor="#1976D2"
-                    app:strokeColor="#1976D2"
-                    app:strokeWidth="1dp" />
+                    android:textColor="@color/colorPrimary"
+                    app:strokeColor="@color/colorPrimary" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnUploadFoto"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="54dp"
                     android:layout_weight="1"
                     android:layout_marginStart="8dp"
+                    app:cornerRadius="12dp"
                     android:text="Adicionar Foto"
                     android:textAllCaps="false"
-                    android:backgroundTint="#FFFFFF"
-                    android:textColor="#E53935"
-                    app:strokeColor="#E53935"
-                    app:strokeWidth="1dp" />
+                    android:textColor="@color/colorError"
+                    app:strokeColor="@color/colorError" />
             </LinearLayout>
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingHorizontal="24dp"
-                android:layout_marginTop="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Data da reserva"
-                    android:textColor="#000"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
-
-                <Button
-                    android:id="@+id/btnSelectDate"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="24dp"
+                app:cardCornerRadius="20dp"
+                app:cardElevation="2dp"
+                app:cardBackgroundColor="@color/colorSurface">
+                
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_light_border"
-                    android:text="Selecionar Data"
-                    android:textAllCaps="false"
-                    android:textColor="#5F5F5F" />
-
-                <TextView
-                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:text="Hora da reserva"
-                    android:textColor="#000"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
+                    android:orientation="vertical"
+                    android:padding="24dp">
 
-                <Button
-                    android:id="@+id/btnSelectTime"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_light_border"
-                    android:text="Selecionar Hora"
-                    android:textAllCaps="false"
-                    android:textColor="#5F5F5F" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Data da reserva"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:text="Número de pessoas"
-                    android:textColor="#000"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnSelectDate"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        app:cornerRadius="12dp"
+                        android:text="Selecionar Data"
+                        android:textAllCaps="false"
+                        android:textColor="@color/colorTextSecondary" />
 
-                <EditText
-                    android:id="@+id/etPartySize"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_light_border"
-                    android:inputType="number"
-                    android:paddingHorizontal="16dp"
-                    android:hint="Ex: 2"
-                    android:textColor="#000" />
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:text="Hora da reserva"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
 
-            <Button
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnSelectTime"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        app:cornerRadius="12dp"
+                        android:text="Selecionar Hora"
+                        android:textAllCaps="false"
+                        android:textColor="@color/colorTextSecondary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:text="Número de pessoas"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
+
+                    <EditText
+                        android:id="@+id/etPartySize"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        android:background="@drawable/input_bg"
+                        android:inputType="number"
+                        android:paddingHorizontal="16dp"
+                        android:hint="Ex: 2"
+                        android:textColor="@color/colorTextPrimary" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnConfirmarReserva"
                 android:layout_width="match_parent"
-                android:layout_height="55dp"
+                android:layout_height="56dp"
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="32dp"
-                android:background="@drawable/btn_primary"
+                app:cornerRadius="14dp"
+                app:backgroundTint="@color/colorPrimary"
                 android:text="Confirmar Reserva"
                 android:textAllCaps="false"
-                android:textColor="#FFF"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textColor="@color/white"
+                android:textSize="16sp" />
 
         </LinearLayout>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_favoritos.xml b/app/src/main/res/layout/activity_favoritos.xml
index 56b0586..cfce089 100644
--- a/app/src/main/res/layout/activity_favoritos.xml
+++ b/app/src/main/res/layout/activity_favoritos.xml
@@ -5,17 +5,20 @@
     android:id="@+id/favoritosRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".FavoritosActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,19 +27,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Restaurantes favoritos"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvFavoritos"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:clipToPadding="false"
         android:paddingBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -47,8 +50,3 @@
         tools:listitem="@layout/item_restaurant" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_gerir_mesas.xml b/app/src/main/res/layout/activity_gerir_mesas.xml
index 3695c34..3d8f7d9 100644
--- a/app/src/main/res/layout/activity_gerir_mesas.xml
+++ b/app/src/main/res/layout/activity_gerir_mesas.xml
@@ -5,17 +5,20 @@
     android:id="@+id/gerirMesasRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".GerirMesasActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,116 +27,128 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Editar mesas"
-        android:textColor="#000"
-        android:textSize="22sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
-        android:layout_marginTop="24dp" />
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/txtDescricaoGerirMesas"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="8dp"
         android:text="Atualize rapidamente as mesas disponíveis, capacidade e estado."
-        android:textColor="#4D4D4D"
+        android:textColor="@color/colorTextSecondary"
         android:textSize="14sp"
+        android:textAlignment="center"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/txtTituloGerirMesas" />
 
-    <LinearLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/formMesas"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="20dp"
-        android:orientation="vertical"
-        android:padding="16dp"
-        android:background="@drawable/btn_light"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="24dp"
+        app:cardCornerRadius="20dp"
+        app:cardElevation="2dp"
+        app:cardBackgroundColor="@color/colorSurface"
+        app:strokeWidth="1dp"
+        app:strokeColor="@color/colorDivider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/txtDescricaoGerirMesas">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Editar ou adicionar mesa"
-            android:textColor="#000"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <EditText
-            android:id="@+id/inputMesaNumero"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="12dp"
-            android:background="@drawable/input_bg"
-            android:hint="Número da mesa"
-            android:inputType="number"
-            android:padding="12dp" />
-
-        <EditText
-            android:id="@+id/inputMesaCapacidade"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="12dp"
-            android:background="@drawable/input_bg"
-            android:hint="Capacidade (lugares)"
-            android:inputType="number"
-            android:padding="12dp" />
-
-        <Spinner
-            android:id="@+id/spinnerEstadoMesa"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="12dp" />
-
-        <Button
-            android:id="@+id/btnGuardarMesa"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/btn_primary"
-            android:text="Guardar"
-            android:textAllCaps="false"
-            android:textColor="#FFFFFF" />
-
-        <Button
-            android:id="@+id/btnRemoverMesa"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/btn_light_border"
-            android:text="Remover"
-            android:textAllCaps="false"
-            android:textColor="#D32F2F" />
-
-        <TextView
-            android:id="@+id/txtMensagemMesa"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text=""
-            android:textColor="#2E7D32"
-            android:textSize="13sp" />
+            android:orientation="vertical"
+            android:padding="20dp">
 
-    </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Editar ou adicionar mesa"
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="18sp"
+                android:fontFamily="sans-serif-medium" />
+
+            <EditText
+                android:id="@+id/inputMesaNumero"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/input_bg"
+                android:hint="Número da mesa"
+                android:inputType="number"
+                android:paddingHorizontal="16dp" />
+
+            <EditText
+                android:id="@+id/inputMesaCapacidade"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="12dp"
+                android:background="@drawable/input_bg"
+                android:hint="Capacidade (lugares)"
+                android:inputType="number"
+                android:paddingHorizontal="16dp" />
+
+            <Spinner
+                android:id="@+id/spinnerEstadoMesa"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="12dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnGuardarMesa"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginTop="16dp"
+                app:cornerRadius="12dp"
+                app:backgroundTint="@color/colorPrimary"
+                android:text="Guardar"
+                android:textAllCaps="false"
+                android:textColor="@color/white" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnRemoverMesa"
+                style="@style/Widget.Material3.Button.OutlinedButton"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginTop="8dp"
+                app:cornerRadius="12dp"
+                app:strokeColor="@color/colorError"
+                android:text="Remover"
+                android:textAllCaps="false"
+                android:textColor="@color/colorError" />
+
+            <TextView
+                android:id="@+id/txtMensagemMesa"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text=""
+                android:textColor="@color/colorSuccess"
+                android:textSize="13sp" />
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
         android:id="@+id/txtListaTitulo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
         android:text="Mesas registadas"
-        android:textColor="#000"
-        android:textSize="16sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="18sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/formMesas" />
 
@@ -141,25 +156,17 @@
         android:id="@+id/listMesas"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="12dp"
         android:layout_marginBottom="16dp"
-        android:divider="#E0E0E0"
+        android:divider="@color/colorDivider"
         android:dividerHeight="1dp"
+        android:scrollbars="none"
+        android:clipToPadding="false"
         app:layout_constraintTop_toBottomOf="@id/txtListaTitulo"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_gestao_staff.xml b/app/src/main/res/layout/activity_gestao_staff.xml
index b65d259..89032ac 100644
--- a/app/src/main/res/layout/activity_gestao_staff.xml
+++ b/app/src/main/res/layout/activity_gestao_staff.xml
@@ -5,17 +5,20 @@
     android:id="@+id/gestaoStaffRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".GestaoStaffActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,117 +27,129 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Gestão de staff"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/txtDescricaoGestaoStaff"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="12dp"
         android:text="Zona para configurar turnos, equipas e disponibilidade do staff."
+        android:textColor="@color/colorTextSecondary"
         android:textSize="14sp"
-        android:textColor="#4D4D4D"
+        android:textAlignment="center"
         app:layout_constraintTop_toBottomOf="@id/txtTituloGestaoStaff"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <LinearLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/formStaff"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="20dp"
-        android:orientation="vertical"
-        android:padding="16dp"
-        android:background="@drawable/btn_light"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="24dp"
+        app:cardCornerRadius="20dp"
+        app:cardElevation="2dp"
+        app:cardBackgroundColor="@color/colorSurface"
+        app:strokeWidth="1dp"
+        app:strokeColor="@color/colorDivider"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/txtDescricaoGestaoStaff">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Atribuir funcionário a uma mesa"
-            android:textColor="#000"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <Spinner
-            android:id="@+id/spinnerNomeStaff"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="12dp"
-            android:background="@drawable/input_bg"
-            android:padding="0dp" />
-
-        <Spinner
-            android:id="@+id/spinnerMesaStaff"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="12dp" />
-
-        <Button
-            android:id="@+id/btnAtribuirStaff"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/btn_primary"
-            android:text="Guardar atribuição"
-            android:textAllCaps="false"
-            android:textColor="#FFFFFF" />
-
-        <Button
-            android:id="@+id/btnEliminarStaff"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_marginTop="8dp"
-            android:background="@android:color/transparent"
-            android:text="Eliminar Funcionário"
-            android:textAllCaps="false"
-            android:textColor="#FF5252" />
-
-        <TextView
-            android:id="@+id/txtMensagemStaff"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text=""
-            android:textColor="#2E7D32"
-            android:textSize="13sp" />
+            android:orientation="vertical"
+            android:padding="20dp">
 
-    </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Atribuir funcionário a uma mesa"
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="16sp"
+                android:fontFamily="sans-serif-medium" />
+
+            <Spinner
+                android:id="@+id/spinnerNomeStaff"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/input_bg"
+                android:padding="0dp" />
+
+            <Spinner
+                android:id="@+id/spinnerMesaStaff"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginTop="12dp"
+                android:background="@drawable/input_bg"
+                android:padding="0dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnAtribuirStaff"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginTop="16dp"
+                app:cornerRadius="12dp"
+                app:backgroundTint="@color/colorPrimary"
+                android:text="Guardar atribuição"
+                android:textAllCaps="false"
+                android:textColor="@color/white" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnEliminarStaff"
+                style="@style/Widget.Material3.Button.TextButton"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginTop="8dp"
+                android:text="Eliminar Funcionário"
+                android:textAllCaps="false"
+                android:textColor="@color/colorError" />
+
+            <TextView
+                android:id="@+id/txtMensagemStaff"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text=""
+                android:textColor="@color/colorSuccess"
+                android:textSize="13sp" />
+
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
         android:id="@+id/txtListaStaffTitulo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
         android:text="Funcionários e mesas"
-        android:textColor="#000"
-        android:textSize="16sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="18sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/formStaff" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnGerirMesasStaff"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/btn_light_border"
-        android:paddingHorizontal="12dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="24dp"
+        app:cornerRadius="12dp"
         android:text="Gerir Mesas"
         android:textAllCaps="false"
-        android:textColor="#00001A"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/txtListaStaffTitulo"
         app:layout_constraintEnd_toEndOf="parent"
@@ -144,34 +159,30 @@
         android:id="@+id/listStaffMesas"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
-        android:divider="#E0E0E0"
+        android:divider="@color/colorDivider"
         android:dividerHeight="1dp"
+        android:scrollbars="none"
+        android:clipToPadding="false"
         app:layout_constraintTop_toBottomOf="@id/txtListaStaffTitulo"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" >
-
-
-    </ListView>
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="32dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
         android:clickable="true"
+        app:backgroundTint="@color/colorPrimary"
+        app:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:srcCompat="@tools:sample/avatars" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_lista_espera.xml b/app/src/main/res/layout/activity_lista_espera.xml
index 52a07a8..7198404 100644
--- a/app/src/main/res/layout/activity_lista_espera.xml
+++ b/app/src/main/res/layout/activity_lista_espera.xml
@@ -5,17 +5,22 @@
     android:id="@+id/listaEsperaRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".ListaEsperaActivity">
 
-    <Button
+    <!-- Header Section -->
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorPrimary"
+        android:textSize="16sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,116 +29,131 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Lista de espera"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
+        android:textColor="@color/colorTextPrimary"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="24dp" />
 
     <TextView
         android:id="@+id/txtDescricaoListaEspera"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginHorizontal="32dp"
+        android:layout_marginTop="8dp"
         android:text="Aqui o estabelecimento irá gerir a lista de espera em tempo real."
-        android:textSize="14sp"
-        android:textColor="#4D4D4D"
+        android:textSize="15sp"
+        android:textAlignment="center"
+        android:lineSpacingExtra="4dp"
+        android:textColor="@color/colorTextSecondary"
         app:layout_constraintTop_toBottomOf="@id/txtTituloListaEspera"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <!-- List Section -->
     <ListView
         android:id="@+id/listReservasP"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_margin="16dp"
-        android:background="#FFFFFF"
-        android:elevation="2dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="16dp"
+        android:background="@android:color/transparent"
+        android:divider="@color/colorDivider"
+        android:dividerHeight="1dp"
+        android:scrollbars="none"
+        android:clipToPadding="false"
+        android:paddingBottom="16dp"
         app:layout_constraintTop_toBottomOf="@id/txtDescricaoListaEspera"
         app:layout_constraintBottom_toTopOf="@id/detalhesCardP" />
 
-    <androidx.cardview.widget.CardView
+    <!-- Selection/Details Card Bottom -->
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/detalhesCardP"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="4dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginBottom="32dp"
+        app:cardCornerRadius="20dp"
+        app:cardElevation="12dp"
+        app:strokeWidth="1dp"
+        app:strokeColor="#E2E8F0"
+        app:cardBackgroundColor="@color/colorSurface"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="24dp">
 
             <TextView
                 android:id="@+id/txtReservaInfoP"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Selecione uma reserva"
-                android:textColor="#000"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="18sp"
+                android:fontFamily="sans-serif-medium" />
 
             <TextView
                 android:id="@+id/txtReservaNotasP"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="8dp"
                 android:text=""
-                android:textColor="#5F5F5F"
+                android:textColor="@color/colorTextSecondary"
+                android:lineSpacingExtra="2dp"
                 android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/txtMensagemReservaP"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="12dp"
                 android:text=""
-                android:textColor="#1976D2"
+                android:textColor="@color/colorPrimary"
                 android:textSize="14sp"
                 android:textStyle="italic" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:orientation="horizontal">
+                android:layout_marginTop="24dp"
+                android:orientation="horizontal"
+                android:weightSum="2">
 
-                <Button
-                    android:id="@+id/btnConfirmarReservaP"
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnRecusarReservaP"
+                    style="@style/Widget.Material3.Button.TonalButton"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="54dp"
                     android:layout_marginEnd="8dp"
                     android:layout_weight="1"
-                    android:backgroundTint="#4CAF50"
-                    android:text="Aceitar"
-                    android:textAllCaps="false"
-                    android:textColor="#FFF"
-                    android:visibility="gone" />
-
-                <Button
-                    android:id="@+id/btnRecusarReservaP"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_weight="1"
-                    android:backgroundTint="#E53935"
+                    app:cornerRadius="14dp"
+                    app:backgroundTint="#FEE2E2"
                     android:text="Recusar"
                     android:textAllCaps="false"
-                    android:textColor="#FFF"
+                    android:textColor="@color/colorError"
                     android:visibility="gone" />
+                
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnConfirmarReservaP"
+                    android:layout_width="0dp"
+                    android:layout_height="54dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    app:cornerRadius="14dp"
+                    app:backgroundTint="@color/colorSuccess"
+                    android:text="Aceitar"
+                    android:textAllCaps="false"
+                    android:textColor="@color/white"
+                    android:visibility="gone" />
+
             </LinearLayout>
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 962ba29..e77998a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,12 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/main"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".MainActivity">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fillViewport="true">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -18,29 +19,24 @@
 
             <ImageView
                 android:id="@+id/logoNaMesa"
-                android:layout_width="90dp"
-                android:layout_height="90dp"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
                 android:src="@drawable/na_mesa"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.494"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.065" />
+                android:layout_marginTop="50dp" />
 
             <TextView
                 android:id="@+id/txtTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="624dp"
+                android:layout_marginTop="16dp"
                 android:text="NaMesa"
-                android:textColor="#000"
-                android:textSize="26sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:textColor="@color/colorTextPrimary"
+                android:textSize="28sp"
+                android:fontFamily="sans-serif-medium"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.488"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/logoNaMesa" />
 
@@ -48,32 +44,35 @@
                 android:id="@+id/txtSub"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="6dp"
                 android:text="Sistema de Reserva de Mesas"
-                android:textColor="#777"
-                android:textSize="14sp"
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/txtTitle" />
 
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/cardContainer"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="40dp"
-                android:layout_marginEnd="32dp"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="3dp"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginBottom="40dp"
+                app:cardCornerRadius="24dp"
+                app:cardElevation="8dp"
+                app:cardBackgroundColor="@color/colorSurface"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/txtSub">
+                app:layout_constraintTop_toBottomOf="@id/txtSub"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintVertical_bias="0.0">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="20dp">
+                    android:padding="24dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -90,19 +89,19 @@
                             android:background="@drawable/btn_light"
                             android:text="Cliente"
                             android:textAllCaps="false"
-                            android:textColorLink="#231F1F"
-                            android:textSize="5pt" />
+                            android:textColor="#231F1F"
+                            android:textSize="14sp" />
 
                         <Button
                             android:id="@+id/btnEstabelecimento"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
-                            android:background="@drawable/tab_unselected"
-                            android:backgroundTint="@color/black"
+                            android:background="@android:color/transparent"
                             android:text="Estabelecimento"
                             android:textAllCaps="false"
-                            android:textSize="5pt" />
+                            android:textColor="@color/colorTextSecondary"
+                            android:textSize="14sp" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -121,103 +120,105 @@
                             android:background="@drawable/tab_selected"
                             android:text="Entrar"
                             android:textAllCaps="false"
-                            android:textSize="5pt" />
+                            android:textColor="#231F1F"
+                            android:textSize="14sp" />
 
                         <Button
                             android:id="@+id/btnCriarConta"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
-                            android:background="@drawable/tab_unselected"
+                            android:background="@android:color/transparent"
                             android:text="Criar Conta"
                             android:textAllCaps="false"
-                            android:textSize="5pt" />
+                            android:textColor="@color/colorTextSecondary"
+                            android:textSize="14sp" />
                     </LinearLayout>
 
                     <EditText
                         android:id="@+id/inputName"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginTop="12dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="20dp"
                         android:background="@drawable/input_bg"
                         android:hint="O seu nome"
                         android:inputType="textPersonName"
-                        android:padding="12dp"
+                        android:paddingHorizontal="16dp"
                         android:visibility="gone" />
 
                     <EditText
                         android:id="@+id/inputEmail"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginTop="12dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="20dp"
                         android:background="@drawable/input_bg"
                         android:hint="Email"
                         android:inputType="textEmailAddress"
-                        android:padding="12dp" />
+                        android:paddingHorizontal="16dp" />
 
                     <EditText
                         android:id="@+id/inputOwnerPhone"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginTop="12dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="16dp"
                         android:background="@drawable/input_bg"
                         android:hint="Telefone do proprietário"
                         android:inputType="phone"
-                        android:padding="12dp"
+                        android:paddingHorizontal="16dp"
                         android:visibility="gone" />
 
                     <EditText
                         android:id="@+id/inputEstablishmentName"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginTop="12dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="16dp"
                         android:background="@drawable/input_bg"
                         android:hint="Nome do estabelecimento"
                         android:inputType="textCapWords"
-                        android:padding="12dp"
+                        android:paddingHorizontal="16dp"
                         android:visibility="gone" />
 
                     <EditText
                         android:id="@+id/inputEstablishmentEmail"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginTop="12dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="16dp"
                         android:background="@drawable/input_bg"
                         android:hint="Email do estabelecimento"
                         android:inputType="textEmailAddress"
-                        android:padding="12dp"
+                        android:paddingHorizontal="16dp"
                         android:visibility="gone" />
 
                     <EditText
                         android:id="@+id/inputEstablishmentPhone"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp"
-                        android:layout_marginTop="12dp"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="16dp"
                         android:background="@drawable/input_bg"
                         android:hint="Telefone do estabelecimento"
                         android:inputType="phone"
-                        android:padding="12dp"
+                        android:paddingHorizontal="16dp"
                         android:visibility="gone" />
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp">
+                        android:layout_marginTop="16dp">
 
                         <EditText
                             android:id="@+id/inputPassword"
                             android:layout_width="match_parent"
-                            android:layout_height="48dp"
+                            android:layout_height="54dp"
                             android:background="@drawable/input_bg"
                             android:hint="Palavra-passe"
                             android:inputType="textPassword"
-                            android:paddingStart="12dp"
+                            android:paddingStart="16dp"
                             android:paddingEnd="48dp" />
 
                         <ImageView
                             android:id="@+id/iconPasswordVisibility"
                             android:layout_width="48dp"
-                            android:layout_height="48dp"
+                            android:layout_height="54dp"
                             android:layout_alignParentEnd="true"
                             android:layout_centerVertical="true"
                             android:padding="12dp"
@@ -231,30 +232,28 @@
                         android:id="@+id/txtForgotPassword"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
+                        android:layout_marginTop="12dp"
                         android:layout_gravity="end"
                         android:text="Esqueceu-se da palavra-passe?"
-                        android:textColor="#1976D2"
+                        android:textColor="@color/colorPrimary"
                         android:textSize="14sp"
                         android:visibility="visible"
                         android:clickable="true"
                         android:focusable="true"/>
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/btnFinalCriarConta"
                         android:layout_width="match_parent"
-                        android:layout_height="50dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/btn_primary"
-                        android:padding="12dp"
+                        android:layout_height="56dp"
+                        android:layout_marginTop="24dp"
+                        app:cornerRadius="14dp"
+                        app:backgroundTint="@color/colorPrimary"
                         android:text="Entrar"
                         android:textAllCaps="false"
-                        android:textColor="#FFF" />
+                        android:textSize="16sp"
+                        android:textColor="@color/white" />
                 </LinearLayout>
-
-            </androidx.cardview.widget.CardView>
+            </com.google.android.material.card.MaterialCardView>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_minhas_reservas.xml b/app/src/main/res/layout/activity_minhas_reservas.xml
index d11d686..b113504 100644
--- a/app/src/main/res/layout/activity_minhas_reservas.xml
+++ b/app/src/main/res/layout/activity_minhas_reservas.xml
@@ -5,17 +5,20 @@
     android:id="@+id/minhasReservasRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".MinhasReservasActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,19 +27,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Minhas Reservas"
-        android:textColor="#000"
-        android:textSize="22sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
-        android:layout_marginTop="24dp" />
+        android:layout_marginTop="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvMinhasReservas"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:clipToPadding="false"
         android:paddingBottom="16dp"
         app:layout_constraintTop_toBottomOf="@id/txtTituloMinhasReservas"
diff --git a/app/src/main/res/layout/activity_nova_reserva.xml b/app/src/main/res/layout/activity_nova_reserva.xml
index 6208d0b..9734967 100644
--- a/app/src/main/res/layout/activity_nova_reserva.xml
+++ b/app/src/main/res/layout/activity_nova_reserva.xml
@@ -5,17 +5,20 @@
     android:id="@+id/novaReservaRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".NovaReservaActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,20 +27,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Nova reserva"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvCategories"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:visibility="visible"
+        android:clipToPadding="false"
+        android:paddingBottom="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -48,8 +53,10 @@
         android:id="@+id/rvRestaurants"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:visibility="gone"
+        android:clipToPadding="false"
+        android:paddingBottom="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -63,6 +70,7 @@
         android:layout_marginTop="24dp"
         android:fillViewport="true"
         android:visibility="gone"
+        android:scrollbars="none"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -72,92 +80,101 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="32dp">
+            android:paddingBottom="48dp">
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingHorizontal="24dp"
-                android:layout_marginTop="16dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Data da reserva"
-                    android:textColor="#000"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
-
-                <Button
-                    android:id="@+id/btnSelectDate"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="8dp"
+                app:cardCornerRadius="20dp"
+                app:cardElevation="2dp"
+                app:cardBackgroundColor="@color/colorSurface">
+                
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_light_border"
-                    android:text="Selecionar Data"
-                    android:textAllCaps="false"
-                    android:textColor="#5F5F5F" />
-
-                <TextView
-                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:text="Hora da reserva"
-                    android:textColor="#000"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
+                    android:orientation="vertical"
+                    android:padding="24dp">
 
-                <Button
-                    android:id="@+id/btnSelectTime"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_light_border"
-                    android:text="Selecionar Hora"
-                    android:textAllCaps="false"
-                    android:textColor="#5F5F5F" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Data da reserva"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:text="Número de pessoas"
-                    android:textColor="#000"
-                    android:textSize="16sp"
-                    android:textStyle="bold" />
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnSelectDate"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        app:cornerRadius="12dp"
+                        android:text="Selecionar Data"
+                        android:textAllCaps="false"
+                        android:textSize="16sp"
+                        android:textColor="@color/colorTextSecondary" />
 
-                <EditText
-                    android:id="@+id/etPartySize"
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/btn_light_border"
-                    android:inputType="number"
-                    android:paddingHorizontal="16dp"
-                    android:hint="Ex: 2"
-                    android:textColor="#000" />
-            </LinearLayout>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:text="Hora da reserva"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
 
-            <Button
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btnSelectTime"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        app:cornerRadius="12dp"
+                        android:text="Selecionar Hora"
+                        android:textAllCaps="false"
+                        android:textSize="16sp"
+                        android:textColor="@color/colorTextSecondary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:text="Número de pessoas"
+                        android:textColor="@color/colorTextPrimary"
+                        android:textSize="16sp"
+                        android:fontFamily="sans-serif-medium" />
+
+                    <EditText
+                        android:id="@+id/etPartySize"
+                        android:layout_width="match_parent"
+                        android:layout_height="54dp"
+                        android:layout_marginTop="12dp"
+                        android:background="@drawable/input_bg"
+                        android:inputType="number"
+                        android:paddingHorizontal="16dp"
+                        android:hint="Ex: 2"
+                        android:textColor="@color/colorTextPrimary" />
+                </LinearLayout>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnConfirmarReserva"
                 android:layout_width="match_parent"
-                android:layout_height="55dp"
+                android:layout_height="56dp"
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="32dp"
-                android:background="@drawable/btn_primary"
+                app:cornerRadius="14dp"
+                app:backgroundTint="@color/colorPrimary"
                 android:text="Confirmar Reserva"
                 android:textAllCaps="false"
-                android:textColor="#FFF"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textColor="@color/white"
+                android:textSize="16sp" />
 
         </LinearLayout>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_partilhar_reserva.xml b/app/src/main/res/layout/activity_partilhar_reserva.xml
index 6b52f3d..eaaf5e3 100644
--- a/app/src/main/res/layout/activity_partilhar_reserva.xml
+++ b/app/src/main/res/layout/activity_partilhar_reserva.xml
@@ -5,17 +5,20 @@
     android:id="@+id/partilharRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#F7F7F7"
+    android:background="@color/colorBackground"
     tools:context=".PartilharReservaActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,30 +27,26 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Partilhar reserva"
-        android:textSize="22sp"
-        android:textStyle="bold"
-        android:textColor="#000"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginTop="32dp" />
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/txtDescricaoPartilhar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="32dp"
         android:layout_marginTop="12dp"
         android:text="Ecrã onde o cliente poderá enviar convites/links de partilha da reserva."
-        android:textSize="14sp"
-        android:textColor="#4D4D4D"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="15sp"
+        android:textAlignment="center"
         app:layout_constraintTop_toBottomOf="@id/txtTituloPartilhar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_profile_dashboard.xml b/app/src/main/res/layout/activity_profile_dashboard.xml
index 47d5215..3b9dcbb 100644
--- a/app/src/main/res/layout/activity_profile_dashboard.xml
+++ b/app/src/main/res/layout/activity_profile_dashboard.xml
@@ -5,17 +5,20 @@
     android:id="@+id/profileRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFFFFF"
+    android:background="@color/colorBackground"
     tools:context=".ProfileDashboardActivity">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnVoltar"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Voltar"
+        android:text="← Voltar"
         android:textAllCaps="false"
+        android:textColor="@color/colorTextSecondary"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,21 +27,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="O seu Perfil"
-        android:textColor="#000"
-        android:textSize="24sp"
-        android:textStyle="bold"
+        android:textColor="@color/colorTextPrimary"
+        android:textSize="28sp"
+        android:fontFamily="sans-serif-medium"
         app:layout_constraintTop_toBottomOf="@id/btnVoltar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="20dp" />
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardProfileBig"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="110dp"
+        android:layout_height="110dp"
         android:layout_marginTop="32dp"
-        app:cardCornerRadius="50dp"
-        app:cardElevation="4dp"
+        app:cardCornerRadius="55dp"
+        app:cardElevation="6dp"
         app:layout_constraintTop_toBottomOf="@id/txtProfileTitle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent">
@@ -48,102 +51,143 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             android:src="@drawable/circle_bg" />
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="24dp"
-        app:layout_constraintTop_toBottomOf="@id/cardProfileBig">
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        app:layout_constraintTop_toBottomOf="@id/cardProfileBig"
+        app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Nome de Exibição"
-            android:textColor="#8A8A8A"
-            android:textSize="12sp" />
-
-        <EditText
-            android:id="@+id/inputProfileName"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:hint="O seu nome"
-            android:padding="12dp"
-            android:background="@drawable/input_bg" />
+            android:orientation="vertical"
+            android:paddingHorizontal="32dp"
+            android:paddingBottom="40dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="Telemóvel"
-            android:textColor="#8A8A8A"
-            android:textSize="12sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Nome de Exibição"
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="14sp" />
 
-        <EditText
-            android:id="@+id/inputProfilePhone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:hint="O seu número"
-            android:inputType="phone"
-            android:padding="12dp"
-            android:background="@drawable/input_bg" />
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                app:boxCornerRadiusTopStart="12dp"
+                app:boxCornerRadiusTopEnd="12dp"
+                app:boxCornerRadiusBottomStart="12dp"
+                app:boxCornerRadiusBottomEnd="12dp"
+                app:boxStrokeWidth="0dp"
+                app:boxBackgroundColor="@color/colorSurface">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="Email"
-            android:textColor="#8A8A8A"
-            android:textSize="12sp" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/inputProfileName"
+                    android:layout_width="match_parent"
+                    android:layout_height="54dp"
+                    android:paddingHorizontal="16dp"
+                    android:hint="O seu nome" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-        <EditText
-            android:id="@+id/inputProfileEmail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:hint="O seu email"
-            android:inputType="textEmailAddress"
-            android:padding="12dp"
-            android:background="@drawable/input_bg" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text="Telemóvel"
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="14sp" />
 
-        <Button
-            android:id="@+id/btnSaveProfile"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:background="@drawable/btn_primary"
-            android:text="Guardar Alterações"
-            android:textAllCaps="false"
-            android:textColor="#FFF" />
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                app:boxCornerRadiusTopStart="12dp"
+                app:boxCornerRadiusTopEnd="12dp"
+                app:boxCornerRadiusBottomStart="12dp"
+                app:boxCornerRadiusBottomEnd="12dp"
+                app:boxStrokeWidth="0dp"
+                app:boxBackgroundColor="@color/colorSurface">
+                
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/inputProfilePhone"
+                    android:layout_width="match_parent"
+                    android:layout_height="54dp"
+                    android:hint="O seu número"
+                    android:inputType="phone"
+                    android:paddingHorizontal="16dp" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginVertical="32dp"
-            android:background="#F0F0F0" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text="Email"
+                android:textColor="@color/colorTextSecondary"
+                android:textSize="14sp" />
 
-        <Button
-            android:id="@+id/btnFavoritos"
-            android:layout_width="match_parent"
-            android:layout_height="55dp"
-            android:background="@drawable/btn_light_border"
-            android:text="Os meus Favoritos"
-            android:textAllCaps="false"
-            android:textColor="#000"
-            android:layout_marginBottom="12dp" />
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                app:boxCornerRadiusTopStart="12dp"
+                app:boxCornerRadiusTopEnd="12dp"
+                app:boxCornerRadiusBottomStart="12dp"
+                app:boxCornerRadiusBottomEnd="12dp"
+                app:boxStrokeWidth="0dp"
+                app:boxBackgroundColor="@color/colorSurface">
 
-        <Button
-            android:id="@+id/btnMinhasReservas"
-            android:layout_width="match_parent"
-            android:layout_height="55dp"
-            android:background="@drawable/btn_light_border"
-            android:text="Histórico de Reservas"
-            android:textAllCaps="false"
-            android:textColor="#000" />
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/inputProfileEmail"
+                    android:layout_width="match_parent"
+                    android:layout_height="54dp"
+                    android:hint="O seu email"
+                    android:inputType="textEmailAddress"
+                    android:paddingHorizontal="16dp" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-    </LinearLayout>
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnSaveProfile"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:layout_marginTop="32dp"
+                app:cornerRadius="14dp"
+                app:backgroundTint="@color/colorPrimary"
+                android:text="Guardar Alterações"
+                android:textAllCaps="false"
+                android:textSize="16sp"
+                android:textColor="@color/white" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginVertical="32dp"
+                android:background="@color/colorDivider" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnFavoritos"
+                style="@style/Widget.Material3.Button.TonalButton"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                app:cornerRadius="14dp"
+                android:text="Os meus Favoritos"
+                android:textAllCaps="false"
+                android:textSize="16sp"
+                android:layout_marginBottom="12dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnMinhasReservas"
+                style="@style/Widget.Material3.Button.TonalButton"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                app:cornerRadius="14dp"
+                android:text="Histórico de Reservas"
+                android:textAllCaps="false"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_food_category.xml b/app/src/main/res/layout/item_food_category.xml
index 0b25a11..df5dfea 100644
--- a/app/src/main/res/layout/item_food_category.xml
+++ b/app/src/main/res/layout/item_food_category.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="100dp"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
     android:layout_marginVertical="8dp"
     app:cardCornerRadius="16dp"
-    app:cardElevation="2dp">
+    app:cardElevation="4dp"
+    app:cardBackgroundColor="@color/colorSurface"
+    app:strokeWidth="1dp"
+    app:strokeColor="@color/colorDivider">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:padding="16dp">
 
         <TextView
@@ -19,19 +22,27 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/imgCategory"
+            android:layout_toStartOf="@id/cvImageCategory"
             android:text="Categoria"
-            android:textColor="#000"
+            android:textColor="@color/colorTextPrimary"
             android:textSize="20sp"
-            android:textStyle="bold" />
+            android:fontFamily="sans-serif-medium" />
 
-        <ImageView
-            android:id="@+id/imgCategory"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/cvImageCategory"
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:scaleType="centerCrop"
-            android:src="@drawable/ic_launcher_background" />
+            app:cardCornerRadius="12dp"
+            app:cardElevation="0dp">
+
+            <ImageView
+                android:id="@+id/imgCategory"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_launcher_background" />
+        </com.google.android.material.card.MaterialCardView>
     </RelativeLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_reserva_cliente.xml b/app/src/main/res/layout/item_reserva_cliente.xml
index 62fad31..767fb97 100644
--- a/app/src/main/res/layout/item_reserva_cliente.xml
+++ b/app/src/main/res/layout/item_reserva_cliente.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
     android:layout_marginVertical="8dp"
     app:cardCornerRadius="16dp"
-    app:cardElevation="2dp">
+    app:cardElevation="4dp"
+    app:cardBackgroundColor="@color/colorSurface"
+    app:strokeWidth="1dp"
+    app:strokeColor="@color/colorDivider">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="20dp">
 
         <TextView
             android:id="@+id/txtReservaRestaurante"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Nome do Restaurante"
-            android:textColor="#000"
+            android:textColor="@color/colorTextPrimary"
             android:textSize="18sp"
-            android:textStyle="bold" />
+            android:fontFamily="sans-serif-medium" />
 
         <TextView
             android:id="@+id/txtReservaDataHora"
@@ -29,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:text="Hoje às 20:00"
-            android:textColor="#757575"
+            android:textColor="@color/colorTextSecondary"
             android:textSize="14sp" />
 
         <TextView
@@ -39,35 +42,39 @@
             android:layout_marginTop="8dp"
             android:text="Estado: Pendente"
             android:textSize="14sp"
-            android:textStyle="bold" />
+            android:textColor="@color/colorSecondary"
+            android:fontFamily="sans-serif-medium" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="16dp"
             android:orientation="horizontal">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnCheckIn"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
                 android:layout_weight="1"
-                android:layout_marginEnd="4dp"
+                android:layout_marginEnd="6dp"
+                app:cornerRadius="12dp"
+                app:backgroundTint="@color/colorPrimary"
                 android:text="Check-in"
                 android:textAllCaps="false"
-                android:background="@drawable/btn_primary"
-                android:textColor="#FFF" />
+                android:textColor="@color/white" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnCancelar"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
                 android:layout_weight="1"
-                android:layout_marginStart="4dp"
+                android:layout_marginStart="6dp"
+                app:cornerRadius="12dp"
+                app:strokeColor="@color/colorError"
                 android:text="Cancelar"
                 android:textAllCaps="false"
-                android:background="@drawable/btn_light_border"
-                android:textColor="#C62828" />
+                android:textColor="@color/colorError" />
         </LinearLayout>
 
         <TextView
@@ -77,8 +84,8 @@
             android:layout_marginTop="8dp"
             android:text="Dê permissões de localização para aceder ao check-in."
             android:textAlignment="center"
-            android:textColor="#D32F2F"
+            android:textColor="@color/colorWarning"
             android:textSize="12sp"
             android:visibility="gone" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_restaurant.xml b/app/src/main/res/layout/item_restaurant.xml
index a5735ec..67118eb 100644
--- a/app/src/main/res/layout/item_restaurant.xml
+++ b/app/src/main/res/layout/item_restaurant.xml
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="16dp"
     android:layout_marginVertical="8dp"
     app:cardCornerRadius="16dp"
-    app:cardElevation="2dp">
+    app:cardElevation="2dp"
+    app:cardBackgroundColor="@color/colorSurface"
+    app:strokeWidth="1dp"
+    app:strokeColor="@color/colorDivider">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/imgRestaurantThumb"
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="12dp"
+            android:layout_marginEnd="16dp"
             android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher" />
+            android:src="@mipmap/ic_launcher"
+            app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Medium" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -36,9 +40,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Restaurant Name"
-                android:textColor="#000"
+                android:textColor="@color/colorTextPrimary"
                 android:textSize="18sp"
-                android:textStyle="bold" />
+                android:fontFamily="sans-serif-medium" />
 
             <TextView
                 android:id="@+id/txtRestaurantCategory"
@@ -46,19 +50,19 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
                 android:text="Category"
-                android:textColor="#757575"
+                android:textColor="@color/colorTextSecondary"
                 android:textSize="14sp" />
         </LinearLayout>
 
         <ImageButton
             android:id="@+id/btnFavorite"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:background="?attr/selectableItemBackgroundBorderless"
-            android:padding="8dp"
+            android:padding="12dp"
             android:scaleType="fitCenter"
             android:src="@android:drawable/btn_star_big_off" />
     </RelativeLayout>
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 40582ec..e9993aa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Brand Colors -->
+    <color name="colorPrimary">#1A428A</color>
+    <color name="colorPrimaryVariant">#102B5E</color>
+    <color name="colorSecondary">#2B72D4</color>
+    
+    <!-- Neutral Colors -->
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="colorBackground">#F8FAFC</color>
+    <color name="colorSurface">#FFFFFF</color>
+    <color name="colorTextPrimary">#1E293B</color>
+    <color name="colorTextSecondary">#64748B</color>
+    
+    <!-- Semantic Colors -->
+    <color name="colorSuccess">#10B981</color>
+    <color name="colorError">#EF4444</color>
+    <color name="colorWarning">#F59E0B</color>
+    <color name="colorDivider">#E2E8F0</color>
+    
+    <!-- Legacy compatibility -->
     <color name="my_light_primary">#BE1F13</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ab4b368..d260148 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Base.Theme.Pap_teste" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <item name="colorPrimary">#958787</item>
+        <!-- Core Colors -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        
+        <!-- Background and Surface Colors -->
+        <item name="android:colorBackground">@color/colorBackground</item>
+        <item name="colorSurface">@color/colorSurface</item>
+        <item name="colorError">@color/colorError</item>
+
+        <!-- Typography base generic configuration -->
+        <item name="android:fontFamily">sans-serif</item>
     </style>
 
     <style name="Theme.Pap_teste" parent="Base.Theme.Pap_teste" />