diff --git a/components/ResultModal.vue b/components/ResultModal.vue
index 7cda2e2..660d559 100644
--- a/components/ResultModal.vue
+++ b/components/ResultModal.vue
@@ -11,9 +11,7 @@ onMounted(() => {
     ref="myModal"
     class="flex justify-center items-center backdrop-blur-sm modal"
   >
-    <div
-      class="flex flex-col p-3 bg-white rounded-md gap-3 modal-box min-w-fit"
-    >
+    <div class="flex flex-col p-3 bg-base rounded-md gap-3 modal-box min-w-fit">
       <h1 class="text-[1.5rem]">
         <slot name="title" />
       </h1>
diff --git a/components/bar/Top.vue b/components/bar/Top.vue
index 01b9a7c..879146d 100644
--- a/components/bar/Top.vue
+++ b/components/bar/Top.vue
@@ -20,7 +20,7 @@ const timeRemainingFriendly = computed(() => {
 
 <template>
   <div
-    class="flex flex-row gap-4 *:flex *:items-center *:gap-3 border-b p-4 border-slate-300 bg-slate-100"
+    class="flex flex-row gap-4 *:flex *:items-center *:gap-3 border-b p-4 border-base-300 bg-base-100"
   >
     <div>
       <span class="block">Wartość punktowa</span>
diff --git a/components/bar/right/Exam.vue b/components/bar/right/Exam.vue
index 323424b..ed31d10 100644
--- a/components/bar/right/Exam.vue
+++ b/components/bar/right/Exam.vue
@@ -14,7 +14,7 @@ const emit = defineEmits<{
 
 <template>
   <div
-    class="flex flex-col items-stretch p-4 gap-10 border-l border-slate-300 bg-slate-100"
+    class="flex flex-col items-stretch p-4 gap-10 border-l border-base-300 bg-base-100"
   >
     <button class="btn btn-warning btn-xl" @click="emit('endExam')">
       Zakończ egzamin
diff --git a/components/bar/right/Result.vue b/components/bar/right/Result.vue
index 33aeb4d..8ed2b0b 100644
--- a/components/bar/right/Result.vue
+++ b/components/bar/right/Result.vue
@@ -16,7 +16,7 @@ const emit = defineEmits<{
 
 <template>
   <div
-    class="flex flex-col items-stretch p-4 gap-6 border-l border-slate-300 bg-slate-100"
+    class="flex flex-col items-stretch p-4 gap-6 border-l border-base-300 bg-base-100"
   >
     <NuxtLink to="/" class="btn btn-warning btn-xl">
       Wróć na stronę główną
@@ -77,7 +77,7 @@ const emit = defineEmits<{
         "
       />
     </div>
-    <div class="flex-1" />
+    <div class="flex-1"></div>
     <NuxtLink to="/exam" class="btn btn-warning btn-xl">
       Rozpocznij jeszcze raz
     </NuxtLink>
diff --git a/components/question/Advanced.vue b/components/question/Advanced.vue
index a14bc40..01021b3 100644
--- a/components/question/Advanced.vue
+++ b/components/question/Advanced.vue
@@ -8,7 +8,7 @@ const answer = defineModel<string | null | undefined>();
 
 <template>
   <div
-    class="flex flex-col gap-5 border-t px-4 py-5 border-slate-300 bg-slate-100"
+    class="flex flex-col gap-5 border-t px-4 py-5 border-base-300 bg-base-100"
   >
     <div class="text-xl">
       {{ question?.text }}
@@ -48,7 +48,7 @@ const answer = defineModel<string | null | undefined>();
 label {
   @apply cursor-pointer flex flex-row gap-2 items-center;
   &:hover {
-    @apply bg-slate-200;
+    @apply bg-base-200;
   }
 }
 span {
diff --git a/components/question/Basic.vue b/components/question/Basic.vue
index 532a500..fd5b1a3 100644
--- a/components/question/Basic.vue
+++ b/components/question/Basic.vue
@@ -8,7 +8,7 @@ const answer = defineModel<string | null | undefined>();
 
 <template>
   <div
-    class="flex flex-col gap-6 border-t px-4 py-5 border-slate-300 bg-slate-100"
+    class="flex flex-col gap-6 border-t px-4 py-5 border-base-300 bg-base-100"
   >
     <div class="text-xl">
       {{ question?.text }}
diff --git a/pages/exam.vue b/pages/exam.vue
index 15dcd8c..bff0dfb 100644
--- a/pages/exam.vue
+++ b/pages/exam.vue
@@ -114,9 +114,10 @@ async function next() {
 
 function endExam() {
   loading.value = true;
-  do {
+  while (!ending.value) {
     next();
-  } while (!ending.value);
+  }
+  next();
   examStore.setResult(result.value);
   examStore.setEnd(true);
   while (true) {