diff --git a/src/main/java/com/alterdekim/javabot/controller/PanelController.java b/src/main/java/com/alterdekim/javabot/controller/PanelController.java
index e36972f..64b28e1 100644
--- a/src/main/java/com/alterdekim/javabot/controller/PanelController.java
+++ b/src/main/java/com/alterdekim/javabot/controller/PanelController.java
@@ -162,6 +162,7 @@ public class PanelController {
             card.setId(theme.getId());
             card.setTitle(textDataValService.getTextDataValById(theme.getTextNameId()).getText());
             card.setBody(new ArrayList<>());
+            card.setSelected(theme.getIsSelected());
             cards.add(card);
         }
         return cards;
@@ -236,5 +237,6 @@ public class PanelController {
         private String title;
         private List<String> body;
         private Long id;
+        private Boolean selected = false;
     }
 }
diff --git a/src/main/resources/templates/panel.html b/src/main/resources/templates/panel.html
index 4c36c58..9c2935d 100644
--- a/src/main/resources/templates/panel.html
+++ b/src/main/resources/templates/panel.html
@@ -91,6 +91,7 @@
                                     </p>
                                     <th:block th:unless="${section == 'script_request'}">
                                         <a th:unless="${section == 'actions' OR section == 'themes'}" href="#" th:data-id="${cc.id}" data-bs-toggle="modal" data-bs-target="#modal_syn" onclick="" class="btn btn-primary" th:text="#{eddittsynn}"></a>
+                                        <a th:if="${section == 'themes'}" href="#" th:data-id="${cc.id}" th:data-selected="${cc.selected}" class="btn btn-success is-selected-theme" th:text="#{thmsel}"></a>
                                         <a href="#" th:data-id="${cc.id}" data-bs-toggle="modal" data-bs-target="#modal" onclick="edit_entry(this)" class="btn btn-primary" th:text="#{edditbtn}"></a>
                                         <a href="#" th:data-id="${cc.id}" onclick="remove_entry(this)" class="btn btn-danger" th:text="#{remombtn}"></a>
                                     </th:block>
@@ -130,7 +131,7 @@
                                             </p>
                                             <th:block th:unless="${section == 'script_request'}">
                                                 <a th:unless="${section == 'actions' OR section == 'themes'}" href="#" th:data-id="${cc.id}" data-bs-toggle="modal" data-bs-target="#modal_syn" onclick="show_synergies_modal(this)" class="btn btn-primary" th:text="#{eddittsynn}"></a>
-                                                <a th:if="${section == 'themes'}" href="#" th:data-id="${cc.id}" class="btn btn-success" th:text="#{thmsel}"></a>
+                                                <a th:if="${section == 'themes'}" href="#" th:data-id="${cc.id}" th:data-selected="${cc.selected}" class="btn btn-success is-selected-theme" th:text="#{thmsel}"></a>
                                                 <a href="#" th:data-id="${cc.id}" data-bs-toggle="modal" data-bs-target="#modal" onclick="edit_entry(this)" class="btn btn-primary" th:text="#{edditbtn}"></a>
                                                 <a href="#" th:data-id="${cc.id}" onclick="remove_entry(this)" class="btn btn-danger" th:text="#{remombtn}"></a>
                                             </th:block>