diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51879c2a3b8..a7aa92c7326 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an exception which occurred when an invalid jstyle was loaded. [#5452](https://github.com/JabRef/jabref/issues/5452)
 - We fixed an error where the preview theme did not adapt to the "Dark" mode [#5463](https://github.com/JabRef/jabref/issues/5463)
 - We fixed an issue where the merge dialog showed the wrong text colour in "Dark" mode [#5516](https://github.com/JabRef/jabref/issues/5516)
+- We fixed visibility issues with the scrollbar and group selection highlight in "Dark" mode, and enabled "Dark" mode for the OpenOffice preview in the style selection window. [#5522](https://github.com/JabRef/jabref/issues/5522)
 - We fixed an issue where the author field was not correctly parsed during bibtex key-generation. [#5551](https://github.com/JabRef/jabref/issues/5551)
 - We fixed an issue where notifications where shown during autosave. [#5555](https://github.com/JabRef/jabref/issues/5555)
 - We fixed an issue where the side pane was not remembering its position. [#5615](https://github.com/JabRef/jabref/issues/5615)
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 8460f03e0d5..be03cf88f99 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -523,6 +523,14 @@
     -fx-padding: 0 0 0 0;
 }
 
+.numberColumn > .hits:any-selected {
+    -fx-background-color: derive(-jr-green, 70%);
+}
+
+.numberColumn > .hits:all-selected {
+    -fx-background-color: -jr-green;
+}
+
 .table-view {
     -fx-background-insets: 0;
     -fx-padding: 0;
diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css
index cde1709d0ea..7da937c01c3 100644
--- a/src/main/java/org/jabref/gui/Dark.css
+++ b/src/main/java/org/jabref/gui/Dark.css
@@ -46,6 +46,9 @@
     -jr-menu-item-foreground: -fx-light-text-color;
     -jr-menu-forground-active: derive(-fx-light-text-color, 50%);
 
+    -jr-scrollbar-thumb: derive(-fx-outer-border, -30%);
+    -jr-scrollbar-track: derive(-fx-control-inner-background, -90%); 
+
     -fx-focused-text-base-color: -fx-dark-text-color;
 
     -jr-tooltip-fg: derive(-fx-light-text-color, 50%);
@@ -64,3 +67,10 @@
     -fx-background-color: -fx-light-text-color, -fx-control-inner-background;
 }
 
+.numberColumn > .hits:any-selected {
+    -fx-background-color: derive(-jr-gray-3, 70%);
+}
+
+.numberColumn > .hits:all-selected {
+    -fx-background-color: -jr-gray-3;
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.css b/src/main/java/org/jabref/gui/groups/GroupTree.css
index 7d72131694c..fc2d6f3a51a 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTree.css
+++ b/src/main/java/org/jabref/gui/groups/GroupTree.css
@@ -29,14 +29,6 @@
     -fx-fill: -jr-group-hits-fg;
 }
 
-.numberColumn > .hits:any-selected {
-    -fx-background-color: derive(-jr-green, 70%);
-}
-
-.numberColumn > .hits:all-selected {
-    -fx-background-color: -jr-green;
-}
-
 .disclosureNodeColumn {
     -fx-alignment: top-right;
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 10a06ae4671..3ac1ba09e55 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -78,6 +78,9 @@ private void initialize() {
         previewBook.setEntry(TestEntry.getTestEntryBook());
         vbox.getChildren().add(previewBook);
 
+        previewArticle.setTheme(preferencesService.getTheme());
+        previewBook.setTheme(preferencesService.getTheme());
+
         colName.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         colJournals.setCellValueFactory(cellData -> cellData.getValue().journalsProperty());
         colFile.setCellValueFactory(cellData -> cellData.getValue().fileProperty());
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 76e0c962e8b..866476edfd6 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -917,6 +917,11 @@ public String getUser() {
         }
     }
 
+    @Override
+    public String getTheme() {
+        return get(FX_THEME);
+    }
+
     /**
      * Get a Map of default tab names to deafult tab fields.
      * The fields are returned as a String with fields separated by ;
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index c9c79cd8b68..4946a19fcee 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -90,6 +90,8 @@ public interface PreferencesService {
 
     String getUser();
 
+    String getTheme();
+
     SaveOrderConfig loadExportSaveOrder();
 
     void storeExportSaveOrder(SaveOrderConfig config);