diff --git a/src/scripts/list.js b/src/scripts/list.js
index 8e41c44..fd6dd40 100644
--- a/src/scripts/list.js
+++ b/src/scripts/list.js
@@ -294,13 +294,12 @@ function createListItem(item) {
     }
 
     const statusLabels = {
-
         'CURRENT': entryType === 'ANIME' ? 'Watching' : 'Reading',
-        'WATCHING': entryType === 'ANIME' ? 'Watching' : 'Reading',
         'COMPLETED': 'Completed',
         'PLANNING': 'Planning',
         'PAUSED': 'Paused',
-        'DROPPED': 'Dropped'
+        'DROPPED': 'Dropped',
+        'REPEATING': entryType === 'ANIME' ? 'Rewatching' : 'Rereading'
     };
 
     const extraInfo = [];
diff --git a/src/scripts/utils/list-modal-manager.js b/src/scripts/utils/list-modal-manager.js
index 6742115..be33a4a 100644
--- a/src/scripts/utils/list-modal-manager.js
+++ b/src/scripts/utils/list-modal-manager.js
@@ -5,7 +5,7 @@ const ListModalManager = {
     currentEntry: null,
 
     STATUS_MAP: {
-        WATCHING: 'CURRENT',
+        CURRENT: 'CURRENT',
         COMPLETED: 'COMPLETED',
         PLANNING: 'PLANNING',
         PAUSED: 'PAUSED',
@@ -15,17 +15,7 @@ const ListModalManager = {
 
     getEntryType(data) {
         if (!data) return 'ANIME';
-
-        if (data.format) {
-            const format = data.format.toUpperCase();
-            if (['MANGA', 'ONE_SHOT', 'MANHWA'].includes(format)) {
-                return 'MANGA';
-            }
-            if (['NOVEL', 'LIGHT_NOVEL'].includes(format)) {
-                return 'NOVEL';
-            }
-        }
-
+        if (data.entry_type) return data.entry_type.toUpperCase();
         return 'ANIME';
     },
 
@@ -118,6 +108,15 @@ const ListModalManager = {
             deleteBtn.style.display = 'none';
         }
 
+        const statusSelect = document.getElementById('entry-status');
+
+        [...statusSelect.options].forEach(opt => {
+            if (opt.value === 'CURRENT') {
+                opt.textContent = entryType === 'ANIME' ? 'Watching' : 'Reading';
+            }
+        });
+
+
         if (progressLabel) {
             if (entryType === 'ANIME') {
                 progressLabel.textContent = 'Episodes Watched';
@@ -128,13 +127,6 @@ const ListModalManager = {
             }
         }
 
-        const statusSelect = document.getElementById('entry-status');
-        [...statusSelect.options].forEach(opt => {
-            if (opt.value === 'WATCHING') {
-                opt.textContent = entryType === 'ANIME' ? 'Watching' : 'Reading';
-            }
-        });
-
         document.getElementById('entry-progress').max = totalUnits;
         document.getElementById('add-list-modal').classList.add('active');
     },
diff --git a/views/anime/anime.html b/views/anime/anime.html
index 742c4e7..4d61863 100644
--- a/views/anime/anime.html
+++ b/views/anime/anime.html
@@ -47,9 +47,10 @@
                     <select id="entry-status" class="form-input">
                         <option value="WATCHING">Watching</option>
                         <option value="COMPLETED">Completed</option>
-                        <option value="PLANNING">Plan to Watch</option>
+                        <option value="PLANNING">Planning</option>
                         <option value="PAUSED">Paused</option>
                         <option value="DROPPED">Dropped</option>
+                        <option value="REPEATING">Rewatching</option>
                     </select>
                 </div>
 
diff --git a/views/anime/animes.html b/views/anime/animes.html
index 907248c..0a0d16d 100644
--- a/views/anime/animes.html
+++ b/views/anime/animes.html
@@ -134,11 +134,12 @@
                 <div class="form-group">
                     <label>Status</label>
                     <select id="entry-status" class="form-input">
-                        <option value="WATCHING">Watching</option>
+                        <option value="WATCHING">Watching/Reading</option>
                         <option value="COMPLETED">Completed</option>
-                        <option value="PLANNING">Plan to Watch</option>
+                        <option value="PLANNING">Planning</option>
                         <option value="PAUSED">Paused</option>
                         <option value="DROPPED">Dropped</option>
+                        <option value="REPEATING">Rewatching</option>
                     </select>
                 </div>
 
diff --git a/views/books/book.html b/views/books/book.html
index c202e9d..e75e682 100644
--- a/views/books/book.html
+++ b/views/books/book.html
@@ -41,6 +41,7 @@
                         <option value="PLANNING">Plan to Read</option>
                         <option value="PAUSED">Paused</option>
                         <option value="DROPPED">Dropped</option>
+                        <option value="REPEATING">Rereading</option>
                     </select>
                 </div>
 
diff --git a/views/books/books.html b/views/books/books.html
index d7fb490..6496492 100644
--- a/views/books/books.html
+++ b/views/books/books.html
@@ -127,6 +127,7 @@
                         <option value="PLANNING">Plan to Read</option>
                         <option value="PAUSED">Paused</option>
                         <option value="DROPPED">Dropped</option>
+                        <option value="REPEATING">Rereading</option>
                     </select>
                 </div>
 
diff --git a/views/list.html b/views/list.html
index 4b192b6..2871037 100644
--- a/views/list.html
+++ b/views/list.html
@@ -115,7 +115,7 @@
             <label>Status</label>
             <select id="status-filter" class="filter-select">
                 <option value="all">All Status</option>
-                <option value="WATCHING">Watching</option>
+                <option value="CURRENT">Watching</option>
                 <option value="COMPLETED">Completed</option>
                 <option value="PLANNING">Planning</option>
                 <option value="PAUSED">Paused</option>
@@ -200,12 +200,12 @@
                 <div class="form-group">
                     <label>Status</label>
                     <select id="entry-status" class="form-input">
-                        <option value="WATCHING">Watching</option>
+                        <option value="CURRENT">Current</option>
                         <option value="COMPLETED">Completed</option>
                         <option value="PLANNING">Planning</option>
                         <option value="PAUSED">Paused</option>
                         <option value="DROPPED">Dropped</option>
-                        <option value="REPEATING">Re-Watching/Re-Reading</option>
+                        <option value="REPEATING">Rewatching/Rereading</option>
                     </select>
                 </div>