From 06ec2cbc9cf677561c858bfcd09b52e5fac440d3 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Fri, 8 Aug 2025 15:12:03 -0400
Subject: [PATCH 01/22] Add "Add Group" walkthrough, tweak quick settings, and
 tweak welcome tab

---
 .../gui/walkthrough/WalkthroughAction.java    | 151 +++++++++++++++++-
 .../walkthrough/declarative/NodeResolver.java |  22 ++-
 .../gui/walkthrough/declarative/Trigger.java  |  61 +++++++
 .../org/jabref/gui/welcome/WelcomeTab.java    |  24 ++-
 .../main/resources/org/jabref/gui/Base.css    |   2 +-
 .../gui/welcome/components/QuickSettings.fxml |   2 +-
 .../main/resources/l10n/JabRef_en.properties  |  44 +++++
 7 files changed, 287 insertions(+), 19 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index 5af61d663c6..beaeb480972 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -6,7 +6,6 @@
 
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContextMenu;
-import javafx.scene.control.DialogPane;
 import javafx.stage.Stage;
 import javafx.util.Duration;
 
@@ -36,6 +35,7 @@ public class WalkthroughAction extends SimpleCommand {
     public static final String PDF_LINK_WALKTHROUGH_NAME = "pdfLink";
     public static final String MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME = "mainFileDirectory";
     public static final String CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME = "customizeEntryTable";
+    public static final String GROUP_WALKTHROUGH_NAME = "group";
 
     private static final Map<String, Walkthrough> WALKTHROUGH_CACHE = new ConcurrentHashMap<>();
 
@@ -59,10 +59,14 @@ public void execute() {
     private Walkthrough getWalkthrough(String name) {
         return WALKTHROUGH_CACHE.computeIfAbsent(name, _ ->
                 switch (name) {
-                    case MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME -> createMainFileDirectoryWalkthrough();
+                    case MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME ->
+                            createMainFileDirectoryWalkthrough();
                     case PDF_LINK_WALKTHROUGH_NAME -> createPdfLinkWalkthrough();
-                    case CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME -> createCustomizeEntryTableWalkthrough();
-                    default -> throw new IllegalArgumentException("Unknown walkthrough: " + name);
+                    case CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME ->
+                            createCustomizeEntryTableWalkthrough();
+                    case GROUP_WALKTHROUGH_NAME -> createGroupWalkthrough();
+                    default ->
+                            throw new IllegalArgumentException("Unknown walkthrough: " + name);
                 }
         );
     }
@@ -274,9 +278,7 @@ private Walkthrough createPdfLinkWalkthrough() {
                 .addStep(WalkthroughStep
                         .tooltip(Localization.lang("Confirm URL download"))
                         .content(new TextBlock(Localization.lang("Click \"OK\" to start downloading the PDF from the entered URL.")))
-                        .resolver(scene -> NodeResolver.predicate(DialogPane.class::isInstance)
-                                                       .resolve(scene)
-                                                       .map(node -> node instanceof DialogPane pane ? pane.lookupButton(ButtonType.OK) : null))
+                        .resolver(NodeResolver.buttonType(ButtonType.OK))
                         .trigger(Trigger.onClick())
                         .activeWindow(WindowResolver.not(stage))
                         .highlight(pdfDialogEffect)
@@ -296,6 +298,141 @@ private Walkthrough createPdfLinkWalkthrough() {
                 .build();
     }
 
+    private Walkthrough createGroupWalkthrough() {
+        WindowResolver mainResolver = () -> Optional.of(stage);
+        WalkthroughEffect groupHighlight = new WalkthroughEffect(
+                new WindowEffect(HighlightEffect.PING),
+                new WindowEffect(mainResolver, HighlightEffect.FULL_SCREEN_DARKEN)
+        );
+        String groupName = Localization.lang("Research Papers");
+        String addGroup = Localization.lang("Add group");
+        String addSelectedEntries = Localization.lang("Add selected entries to this group");
+
+        return Walkthrough
+                .create(stateManager)
+                // Step 1: Open example library
+                .addStep(WalkthroughStep.sideEffect(Localization.lang("Open Example Library"))
+                        .sideEffect(new OpenLibrarySideEffect(frame)))
+                // Step 2: Highlight groups sidepane
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Welcome to groups walkthrough"))
+                    .content(
+                                new TextBlock(Localization.lang("This walkthrough will guide you through creating and managing groups in JabRef. Groups help you organize your bibliography entries into collections. We've opened an example library so you can practice with real entries.")),
+                                new InfoBlock(Localization.lang("The groups panel on the left side shows all your groups in a tree structure. You can create groups, add entries to them, and organize them hierarchically."))
+                        )
+                        .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("GroupsSidePaneComponent")))
+                        .continueButton(Localization.lang("Continue"))
+                        .position(PanelPosition.RIGHT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 3: Click "Add group" button
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Click on \"%0\" button", addGroup))
+                        .content(new TextBlock(Localization.lang("Let's create your first group. Click the \"%0\" button at the bottom of the groups panel to open the group creation dialog.", addGroup)))
+                        .resolver(NodeResolver.selectorWithText(".button", addGroup::equals))
+                        .trigger(Trigger.create().withWindowChangeListener().onClick())
+                        .position(TooltipPosition.TOP)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 4: Fill group creation dialog
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Enter group name"))
+                        .content(new TextBlock(Localization.lang("Type \"%0\" as the name for your group.", groupName)))
+                        .resolver(NodeResolver.fxId("nameField"))
+                        .trigger(Trigger.onTextEquals(groupName))
+                        .position(TooltipPosition.RIGHT)
+                        .activeWindow(WindowResolver.title(Localization.lang("Add group")))
+                        .showQuitButton(false)
+                        .highlight(groupHighlight))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Add a description (optional)"))
+                        .content(new TextBlock(Localization.lang("You can add a description to help remember what this group is for. For example, type \"Important research papers for my project\".")))
+                        .resolver(NodeResolver.fxId("descriptionField"))
+                        .trigger(Trigger.onTextInput())
+                        .position(TooltipPosition.RIGHT)
+                        .activeWindow(WindowResolver.title(Localization.lang("Add group")))
+                        .showQuitButton(false)
+                        .highlight(groupHighlight))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Select \"Explicit selection\""))
+                        .content(new TextBlock(Localization.lang("This allows you to manually choose which entries belong to this group.")))
+                        .resolver(NodeResolver.fxId("explicitRadioButton"))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.RIGHT)
+                        .activeWindow(WindowResolver.title(Localization.lang("Add group")))
+                        .showQuitButton(false)
+                        .highlight(groupHighlight))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Click \"OK\" to create the group"))
+                        .content(new TextBlock(Localization.lang("Now click \"OK\" to create your new group.")))
+                        .resolver(NodeResolver.buttonType(ButtonType.OK))
+                        .trigger(Trigger.onClick())
+                        .activeWindow(WindowResolver.title(Localization.lang("Add group")))
+                        .showQuitButton(false)
+                        .highlight(groupHighlight))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Click on \"All entries\" group"))
+                        .content(new TextBlock(Localization.lang("Select \"All entries\" to show all entries in the main table before dragging items to your new group.")))
+                        .resolver(NodeResolver.selectorWithText(
+                                ".tree-table-row-cell",
+                                text -> Localization.lang("All entries").equals(text)
+                                        || (text != null && text.contains(Localization.lang("All entries")))))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.RIGHT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 5: Drag and drop entry to group
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Add entries to your group"))
+                        .content(
+                                new TextBlock(Localization.lang("Your \"%0\" group has been created. Now let's add some entries to it.", groupName)),
+                                new InfoBlock(Localization.lang("You can add entries to a group by dragging and dropping them. Try selecting the \"Ding_2006\" entry from the main table and drag it to your new group."))
+                        )
+                        .resolver(NodeResolver.selectorWithText(".table-row-cell",
+                                text -> "Ding_2006".equals(text)
+                                        || "Ding et al.".equals(text)
+                                        || "Chocolate and Prevention of Cardiovascular Disease: A Systematic Review".equals(text)))
+                        .continueButton(Localization.lang("Continue"))
+                        .position(PanelPosition.RIGHT)
+                        .highlight(HighlightEffect.PING))
+                // Step 6: Right-click to add entry
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Select the Corti_2009 entry"))
+                        .content(new TextBlock(Localization.lang("You can also add entries using the context menu. First, select the \"Corti_2009\" entry (Cocoa and Cardiovascular Health by Corti et al.) from the main table.")))
+                        .resolver(NodeResolver.selectorWithText(".table-row-cell",
+                                text -> "Corti_2009".equals(text)
+                                        || "Corti et al.".equals(text)
+                                        || "Cocoa and Cardiovascular Health".equals(text)))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.RIGHT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Right-click on your group"))
+                        .content(new TextBlock(Localization.lang("Now right-click on your \"%0\" group to open the context menu.", groupName)))
+                        .resolver(NodeResolver.selectorWithText(".tree-table-row-cell",
+                                text -> text != null && text.contains(groupName)))
+                        .trigger(Trigger.create().withWindowChangeListener().onRightClick())
+                        .position(TooltipPosition.RIGHT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Click \"%0\"", addSelectedEntries))
+                        .content(new TextBlock(Localization.lang("Click on \"%0\" to add the Corti_2009 entry to your group.", addSelectedEntries)))
+                        .resolver(NodeResolver.menuItem(addSelectedEntries))
+                        .trigger(Trigger.onClick())
+                        .activeWindow(WindowResolver.clazz(ContextMenu.class))
+                        .showQuitButton(false)
+                        .highlight(groupHighlight))
+                // Completion
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Groups walkthrough completed"))
+                        .content(
+                                new TextBlock(Localization.lang("You've learned how to create groups and add entries to them. Groups are a powerful way to organize your bibliography and can be nested to create hierarchical structures.")),
+                                new InfoBlock(Localization.lang("For more information about groups: [Groups documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)"))
+                        )
+                        .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("GroupsSidePaneComponent")))
+                        .continueButton(Localization.lang("Finish"))
+                        .position(PanelPosition.RIGHT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .build();
+    }
+
     private Walkthrough createMainFileDirectoryWalkthrough() {
         WindowResolver mainResolver = () -> Optional.of(stage);
         WalkthroughEffect preferenceHighlight = new WalkthroughEffect(
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
index 60be51a7933..1d82ce74584 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
@@ -1,15 +1,16 @@
 package org.jabref.gui.walkthrough.declarative;
 
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContextMenu;
+import javafx.scene.control.DialogPane;
+import javafx.scene.control.MenuItem;
 
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.IconTheme;
@@ -74,6 +75,17 @@ static NodeResolver action(@NonNull StandardActions action) {
         return scene -> Optional.ofNullable(findNodeByAction(scene, action));
     }
 
+    /// Creates a resolver that finds a button by its button type, assuming the node
+    /// resolved is a [javafx.scene.control.DialogPane].
+    ///
+    /// @param buttonType the button type to find
+    /// @return a resolver that finds the button by button type
+    static NodeResolver buttonType(@NonNull ButtonType buttonType) {
+        return scene -> predicate(DialogPane.class::isInstance)
+                                .resolve(scene)
+                                .map(node -> node instanceof DialogPane pane ? pane.lookupButton(buttonType) : null);
+    }
+
     /// Creates a resolver that finds a node by selector first, then predicate.
     ///
     /// @param selector    the style class to match
@@ -110,11 +122,7 @@ static NodeResolver menuItem(@NonNull String key) {
                                .ofNullable(item.getText())
                                .map(str -> str.contains(Localization.lang(key)))
                                .orElse(false))
-                       .flatMap(item -> Stream
-                               .iterate(item.getGraphic(), Objects::nonNull, Node::getParent)
-                               .filter(node -> node.getStyleClass().contains("menu-item"))
-                               .findFirst().stream()
-                       ).findFirst();
+                       .map(MenuItem::getStyleableNode).findFirst();
         };
     }
 
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/Trigger.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/Trigger.java
index bd9a36a06d1..2bddc55fde8 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/Trigger.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/Trigger.java
@@ -5,6 +5,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.regex.Pattern;
 
 import javafx.beans.value.ChangeListener;
 import javafx.collections.ListChangeListener;
@@ -67,6 +68,14 @@ static Trigger onFetchFulltextCompleted() {
         return create().onFetchFulltextCompleted().build();
     }
 
+    static Trigger onTextEquals(String expected) {
+        return create().onTextEquals(expected).build();
+    }
+
+    static Trigger onTextMatchesRegex(String regex) {
+        return create().onTextMatchesRegex(regex).build();
+    }
+
     static Builder create() {
         return new Builder();
     }
@@ -177,6 +186,41 @@ public Builder onTextInput() {
             return this;
         }
 
+        public Builder onTextEquals(String expected) {
+            Objects.requireNonNull(expected, "expected must not be null");
+            setGenerator((node, onNavigate) -> {
+                if (!(node instanceof TextInputControl textInput)) {
+                    throw new IllegalArgumentException("onTextEquals can only be used with TextInputControl");
+                }
+                ChangeListener<String> listener = (_, _, newText) -> {
+                    if (expected.equals(newText)) {
+                        onNavigate.apply(NOTHING);
+                    }
+                };
+                textInput.textProperty().addListener(listener);
+                return () -> textInput.textProperty().removeListener(listener);
+            });
+            return this;
+        }
+
+        public Builder onTextMatchesRegex(String regex) {
+            Objects.requireNonNull(regex, "regex must not be null");
+            final Pattern compiled = Pattern.compile(regex);
+            setGenerator((node, onNavigate) -> {
+                if (!(node instanceof TextInputControl textInput)) {
+                    throw new IllegalArgumentException("onTextMatchesRegex can only be used with TextInputControl");
+                }
+                ChangeListener<String> listener = (_, _, newText) -> {
+                    if (newText != null && compiled.matcher(newText).matches()) {
+                        onNavigate.apply(NOTHING);
+                    }
+                };
+                textInput.textProperty().addListener(listener);
+                return () -> textInput.textProperty().removeListener(listener);
+            });
+            return this;
+        }
+
         public Builder onDoubleClick() {
             setGenerator((node, onNavigate) -> {
                 EventHandler<MouseEvent> handler = event -> {
@@ -190,6 +234,23 @@ public Builder onDoubleClick() {
             return this;
         }
 
+        public Builder onRightClick() {
+            setGenerator((node, onNavigate) -> {
+                final EventDispatcher originalDispatcher = node.getEventDispatcher();
+                final EventDispatcher newDispatcher = (event, tail) -> {
+                    if (event.getEventType() == MouseEvent.MOUSE_PRESSED && ((MouseEvent) event).getButton() == javafx.scene.input.MouseButton.SECONDARY) {
+                        node.setEventDispatcher(originalDispatcher);
+                        Supplier<Event> originalAction = () -> originalDispatcher.dispatchEvent(event, tail);
+                        return (Event) onNavigate.apply(originalAction);
+                    }
+                    return originalDispatcher.dispatchEvent(event, tail);
+                };
+                node.setEventDispatcher(newDispatcher);
+                return () -> node.setEventDispatcher(originalDispatcher);
+            });
+            return this;
+        }
+
         public Builder onFileAddedToListView() {
             setGenerator((node, onNavigate) -> {
                 ListView<?> listView = (ListView<?>) node.lookup("#listView");
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index c58443010ba..fe509968d7d 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -11,6 +11,7 @@
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.HBox;
@@ -177,13 +178,30 @@ private VBox createWalkthroughBox() {
 
         Button linkPdfWalkthroughButton = createWalkthroughButton(
                 Localization.lang("Link PDF to entries"),
-                IconTheme.JabRefIcons.TOGGLE_GROUPS,
+                IconTheme.JabRefIcons.PDF_FILE,
                 WalkthroughAction.PDF_LINK_WALKTHROUGH_NAME
         );
 
-        walkthroughsContainer.getChildren().addAll(mainFileDirWalkthroughButton, entryTableWalkthroughButton, linkPdfWalkthroughButton);
+        Button groupButton = createWalkthroughButton(
+                Localization.lang("Add group"),
+                IconTheme.JabRefIcons.NEW_GROUP,
+                WalkthroughAction.GROUP_WALKTHROUGH_NAME
+        );
+
+        walkthroughsContainer.getChildren().addAll(
+                mainFileDirWalkthroughButton,
+                entryTableWalkthroughButton,
+                linkPdfWalkthroughButton,
+                groupButton
+        );
+
+        ScrollPane scrollPane = new ScrollPane(walkthroughsContainer);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.getStyleClass().add("walkthroughs-scroll-pane");
 
-        return createVBoxContainer(header, walkthroughsContainer);
+        return createVBoxContainer(header, scrollPane);
     }
 
     private VBox createCommunityBox() {
diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index 1774fff976c..4c0d017610a 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -2584,13 +2584,13 @@ journalInfo .grid-cell-b {
 
 
 /* Quick Settings */
-
 .quick-settings-container,
 .walkthroughs-container {
     -fx-spacing: 0.6667em;
     -fx-alignment: top-left;
 }
 
+.walkthroughs-scroll-pane,
 .quick-settings-scroll-pane {
     -fx-max-height: 13.333em; /* item-size * 4 + gap * 3 = (0.0833 * 2 + 0.833 * 2 + 1) * 4 + 0.667 * 3 */
     -fx-min-height: 13.333em;
diff --git a/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml b/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
index 380853c3451..b40eca9007e 100644
--- a/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
@@ -8,7 +8,7 @@
 
 <fx:root type="VBox" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.welcome.components.QuickSettings"
-         styleClass="welcome-content-column">
+         styleClass="welcome-section">
     <Label styleClass="welcome-header-label" text="%Quick settings"/>
     <ScrollPane fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="AS_NEEDED"
                 styleClass="quick-settings-scroll-pane">
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index f58556ce066..c54e43d5b34 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -3094,6 +3094,50 @@ The\ columns\ you\ configure\ here\ will\ be\ displayed\ whenever\ you\ open\ a\
 Your\ entry\ table\ columns\ are\ now\ configured.\ These\ settings\ will\ be\ applied\ to\ all\ your\ libraries\ in\ JabRef.=Your entry table columns are now configured. These settings will be applied to all your libraries in JabRef.
 You\ can\ find\ more\ information\ about\ customizing\ JabRef\ at\ [documentation](https\://docs.jabref.org/advanced/main-window)=You can find more information about customizing JabRef at [documentation](https://docs.jabref.org/advanced/main-window)
 
+# Walkthrough: Groups
+# Step 2
+Welcome\ to\ groups\ walkthrough=Welcome to groups walkthrough
+This\ walkthrough\ will\ guide\ you\ through\ creating\ and\ managing\ groups\ in\ JabRef.\ Groups\ help\ you\ organize\ your\ bibliography\ entries\ into\ collections.\ We've\ opened\ an\ example\ library\ so\ you\ can\ practice\ with\ real\ entries.=This walkthrough will guide you through creating and managing groups in JabRef. Groups help you organize your bibliography entries into collections. We've opened an example library so you can practice with real entries.
+The\ groups\ panel\ on\ the\ left\ side\ shows\ all\ your\ groups\ in\ a\ tree\ structure.\ You\ can\ create\ groups,\ add\ entries\ to\ them,\ and\ organize\ them\ hierarchically.=The groups panel on the left side shows all your groups in a tree structure. You can create groups, add entries to them, and organize them hierarchically.
+
+# Step 3
+Click\ on\ \"%0\"\ button=Click on "%0" button
+Let's\ create\ your\ first\ group.\ Click\ the\ \"%0\"\ button\ at\ the\ bottom\ of\ the\ groups\ panel\ to\ open\ the\ group\ creation\ dialog.=Let's create your first group. Click the "%0" button at the bottom of the groups panel to open the group creation dialog.
+
+# Step 4.1
+Enter\ group\ name=Enter group name
+Research\ Papers=Research Papers
+Type\ \"%0\"\ as\ the\ name\ for\ your\ group.=Type "%0" as the name for your group.
+# Step 4.2
+Add\ a\ description\ (optional)=Add a description (optional)
+You\ can\ add\ a\ description\ to\ help\ remember\ what\ this\ group\ is\ for.\ For\ example,\ type\ \"Important\ research\ papers\ for\ my\ project\".=You can add a description to help remember what this group is for. For example, type "Important research papers for my project".
+# Step 4.3
+Select\ \"Explicit\ selection\"=Select "Explicit selection"
+This\ allows\ you\ to\ manually\ choose\ which\ entries\ belong\ to\ this\ group.=This allows you to manually choose which entries belong to this group.
+# Step 4.4
+Click\ \"OK\"\ to\ create\ the\ group=Click "OK" to create the group
+Now\ click\ \"OK\"\ to\ create\ your\ new\ group.=Now click "OK" to create your new group.
+# Step 4.5
+Click\ on\ \"All\ entries\"\ group=Click on "All entries" group
+Select\ \"All\ entries\"\ to\ show\ all\ entries\ in\ the\ main\ table\ before\ dragging\ items\ to\ your\ new\ group.=Select "All entries" to show all entries in the main table before dragging items to your new group.
+
+# Step 5
+Add\ entries\ to\ your\ group=Add entries to your group
+Your\ \"%0\"\ group\ has\ been\ created.\ Now\ let's\ add\ some\ entries\ to\ it.=Your "%0" group has been created. Now let's add some entries to it.
+You\ can\ add\ entries\ to\ a\ group\ by\ dragging\ and\ dropping\ them.\ Try\ selecting\ the\ \"Ding_2006\"\ entry\ from\ the\ main\ table\ and\ drag\ it\ to\ your\ new\ group.=You can add entries to a group by dragging and dropping them. Try selecting the "Ding_2006" entry from the main table and drag it to your new group.
+
+# Step 6
+Select\ the\ Corti_2009\ entry=Select the Corti_2009 entry
+You\ can\ also\ add\ entries\ using\ the\ context\ menu.\ First,\ select\ the\ \"Corti_2009\"\ entry\ (Cocoa\ and\ Cardiovascular\ Health\ by\ Corti\ et\ al.)\ from\ the\ main\ table.=You can also add entries using the context menu. First, select the "Corti_2009" entry (Cocoa and Cardiovascular Health by Corti et al.) from the main table.
+Right-click\ on\ your\ group=Right-click on your group
+Now\ right-click\ on\ your\ \"%0"\ group\ to\ open\ the\ context\ menu.=Now right-click on your "%0" group to open the context menu.
+Click\ \"%0\"=Click "%0"
+Click\ on\ \"%0\"\ to\ add\ the\ Corti_2009\ entry\ to\ your\ group.=Click on "%0" to add the Corti_2009 entry to your group.
+
+# Completion
+Groups\ walkthrough\ completed=Groups walkthrough completed
+You've\ learned\ how\ to\ create\ groups\ and\ add\ entries\ to\ them.\ Groups\ are\ a\ powerful\ way\ to\ organize\ your\ bibliography\ and\ can\ be\ nested\ to\ create\ hierarchical\ structures.=You've learned how to create groups and add entries to them. Groups are a powerful way to organize your bibliography and can be nested to create hierarchical structures.
+For\ more\ information\ about\ groups\:\ [Groups\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)=For more information about groups: [Groups documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)
 
 # Walkthrough side effects
 Side\ effect\ timeout=Side effect timeout

From adcb44379964e457ffba727a489a80787a3b173e Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sat, 9 Aug 2025 19:55:53 -0400
Subject: [PATCH 02/22] Refactor search modifier buttons to bind
 bidirectionally with SearchPreferences

---
 .../jabref/gui/search/GlobalSearchBar.java    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 028c66f9558..b9e69dd464f 100644
--- a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -275,36 +275,42 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        regexButton.setSelected(searchPreferences.isRegularExpression());
+        regexButton.selectedProperty().bind(Bindings.createBooleanBinding(
+                () -> searchPreferences.getObservableSearchFlags().contains(SearchFlags.REGULAR_EXPRESSION),
+                searchPreferences.getObservableSearchFlags()
+        ));
         regexButton.setTooltip(new Tooltip(Localization.lang("Regular expression") + "\n" + Localization.lang("This only affects unfielded terms. For using RegEx in a fielded term, use =~ operator.")));
         initSearchModifierButton(regexButton);
-        regexButton.setOnAction(event -> {
+        regexButton.setOnAction(_ -> {
             searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, regexButton.isSelected());
             searchField.requestFocus();
             updateSearchQuery();
         });
 
-        caseSensitiveButton.setSelected(searchPreferences.isCaseSensitive());
+        caseSensitiveButton.selectedProperty().bind(Bindings.createBooleanBinding(
+                () -> searchPreferences.getObservableSearchFlags().contains(SearchFlags.CASE_SENSITIVE),
+                searchPreferences.getObservableSearchFlags()
+        ));
         caseSensitiveButton.setTooltip(new Tooltip(Localization.lang("Case sensitive") + "\n" + Localization.lang("This only affects unfielded terms. For using case-sensitive in a fielded term, use =! operator.")));
         initSearchModifierButton(caseSensitiveButton);
-        caseSensitiveButton.setOnAction(event -> {
+        caseSensitiveButton.setOnAction(_ -> {
             searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, caseSensitiveButton.isSelected());
             searchField.requestFocus();
             updateSearchQuery();
         });
 
-        keepSearchString.setSelected(searchPreferences.shouldKeepSearchString());
+        keepSearchString.selectedProperty().bindBidirectional(searchPreferences.keepSearchStingProperty());
         keepSearchString.setTooltip(new Tooltip(Localization.lang("Keep search string across libraries")));
         initSearchModifierButton(keepSearchString);
-        keepSearchString.selectedProperty().addListener((obs, oldVal, newVal) -> {
-            searchPreferences.setKeepSearchString(newVal);
-            searchField.requestFocus();
-        });
+        keepSearchString.selectedProperty().addListener((_, _, _) -> searchField.requestFocus());
 
-        filterModeButton.setSelected(searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER);
+        filterModeButton.selectedProperty().bind(Bindings.createBooleanBinding(
+                () -> searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER,
+                searchPreferences.searchDisplayModeProperty()
+        ));
         filterModeButton.setTooltip(new Tooltip(Localization.lang("Filter search results")));
         initSearchModifierButton(filterModeButton);
-        filterModeButton.setOnAction(event -> {
+        filterModeButton.setOnAction(_ -> {
             searchPreferences.setSearchDisplayMode(filterModeButton.isSelected() ? SearchDisplayMode.FILTER : SearchDisplayMode.FLOAT);
             searchField.requestFocus();
         });

From bcb08aff546d89fe1970b258d010bc58ada83b25 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 12:40:01 -0400
Subject: [PATCH 03/22] Fix issue with repeated localization

---
 .../org/jabref/gui/walkthrough/WalkthroughRenderer.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughRenderer.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughRenderer.java
index 43679021794..90b5e9d641c 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughRenderer.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughRenderer.java
@@ -37,7 +37,7 @@ public Node render(TooltipStep step, Walkthrough walkthrough, Runnable beforeNav
         titleContainer.getStyleClass().add("walkthrough-title-container");
         MarkdownTextFlow titleFlow = new MarkdownTextFlow(titleContainer);
         titleFlow.getStyleClass().add("walkthrough-tooltip-title");
-        titleFlow.setMarkdown("## " + Localization.lang(step.title()));
+        titleFlow.setMarkdown(step.title());
         titleContainer.getChildren().add(titleFlow);
 
         VBox contentContainer = createContent(step, walkthrough, beforeNavigate);
@@ -68,7 +68,7 @@ public Node render(PanelStep step, Walkthrough walkthrough, Runnable beforeNavig
         titleContainer.getStyleClass().add("walkthrough-title-container");
         MarkdownTextFlow titleFlow = new MarkdownTextFlow(titleContainer);
         titleFlow.getStyleClass().add("walkthrough-title");
-        titleFlow.setMarkdown("## " + Localization.lang(step.title()));
+        titleFlow.setMarkdown(step.title());
         titleContainer.getChildren().add(titleFlow);
 
         VBox contentContainer = createContent(step, walkthrough, beforeNavigate);
@@ -105,7 +105,7 @@ private Node render(TextBlock textBlock) {
 
         MarkdownTextFlow textFlow = new MarkdownTextFlow(container);
         textFlow.getStyleClass().add("walkthrough-text-content");
-        textFlow.setMarkdown(Localization.lang(textBlock.text()));
+        textFlow.setMarkdown(textBlock.text());
 
         container.getChildren().add(textFlow);
         return container;
@@ -120,7 +120,7 @@ private Node render(InfoBlock infoBlock) {
         StackPane textContainer = new StackPane();
         MarkdownTextFlow infoFlow = new MarkdownTextFlow(textContainer);
         infoFlow.getStyleClass().add("walkthrough-info-text");
-        infoFlow.setMarkdown(Localization.lang(infoBlock.text()));
+        infoFlow.setMarkdown(infoBlock.text());
         textContainer.getChildren().add(infoFlow);
 
         HBox.setHgrow(textContainer, Priority.ALWAYS);

From 66248aef2356586a721b6ba9a416ee968acf618c Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:06:31 -0400
Subject: [PATCH 04/22] Add donation popup in WelcomeTab

---
 .../gui/preferences/DonationPreferences.java  |  42 +++++
 .../gui/preferences/JabRefGuiPreferences.java |  17 ++
 .../gui/preferences/general/GeneralTab.java   |   2 +
 .../general/GeneralTabViewModel.java          |   7 +
 .../EnsureSearchSettingsSideEffect.java       |  55 ++++++
 .../welcome/components/DonationProvider.java  | 158 ++++++++++++++++++
 .../main/resources/org/jabref/gui/Base.css    |  58 +++++++
 .../main/resources/l10n/JabRef_en.properties  |   5 +
 8 files changed, 344 insertions(+)
 create mode 100644 jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java
 create mode 100644 jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
 create mode 100644 jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java

diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java
new file mode 100644
index 00000000000..fa6b3793d70
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java
@@ -0,0 +1,42 @@
+package org.jabref.gui.preferences;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+
+public class DonationPreferences {
+    private final BooleanProperty neverShowAgain = new SimpleBooleanProperty();
+    private final IntegerProperty lastShownEpochDay = new SimpleIntegerProperty();
+
+    public DonationPreferences(boolean neverShowAgain, int lastShownEpochDay) {
+        this.neverShowAgain.set(neverShowAgain);
+        this.lastShownEpochDay.set(lastShownEpochDay);
+    }
+
+    public boolean isNeverShowAgain() {
+        return neverShowAgain.get();
+    }
+
+    public void setNeverShowAgain(boolean value) {
+        this.neverShowAgain.set(value);
+    }
+
+    public BooleanProperty neverShowAgainProperty() {
+        return neverShowAgain;
+    }
+
+    public int getLastShownEpochDay() {
+        return lastShownEpochDay.get();
+    }
+
+    public void setLastShownEpochDay(int value) {
+        this.lastShownEpochDay.set(value);
+    }
+
+    public IntegerProperty lastShownEpochDayProperty() {
+        return lastShownEpochDay;
+    }
+}
+
+
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
index c82ee3c79d3..703952b7f66 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
@@ -204,6 +204,11 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
     private static final String INCLUDE_CROSS_REFERENCES = "includeCrossReferences";
     private static final String ASK_FOR_INCLUDING_CROSS_REFERENCES = "askForIncludingCrossReferences";
 
+    // region Donation preferences
+    private static final String DONATION_NEVER_SHOW = "donationNeverShow";
+    private static final String DONATION_LAST_SHOWN_EPOCH_DAY = "donationLastShownEpochDay";
+    // endregion
+
     // region NewEntryPreferences
     private static final String CREATE_ENTRY_APPROACH = "latestApproach";
     private static final String CREATE_ENTRY_EXPAND_RECOMMENDED = "typesRecommendedExpanded";
@@ -378,6 +383,11 @@ private JabRefGuiPreferences() {
         defaults.put(ASK_FOR_INCLUDING_CROSS_REFERENCES, Boolean.TRUE);
         defaults.put(INCLUDE_CROSS_REFERENCES, Boolean.FALSE);
 
+        // region donation defaults
+        defaults.put(DONATION_NEVER_SHOW, Boolean.FALSE);
+        defaults.put(DONATION_LAST_SHOWN_EPOCH_DAY, -1);
+        // endregion
+
         // region NewEntryUnifierPreferences
         defaults.put(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(NewEntryDialogTab.CHOOSE_ENTRY_TYPE));
         defaults.put(CREATE_ENTRY_EXPAND_RECOMMENDED, true);
@@ -1192,6 +1202,13 @@ public NewEntryPreferences getNewEntryPreferences() {
         return newEntryPreferences;
     }
 
+    public DonationPreferences getDonationPreferences() {
+        DonationPreferences dp = new DonationPreferences(getBoolean(DONATION_NEVER_SHOW), getInt(DONATION_LAST_SHOWN_EPOCH_DAY));
+        EasyBind.listen(dp.neverShowAgainProperty(), (_, _, nv) -> putBoolean(DONATION_NEVER_SHOW, nv));
+        EasyBind.listen(dp.lastShownEpochDayProperty(), (_, _, nv) -> putInt(DONATION_LAST_SHOWN_EPOCH_DAY, nv.intValue()));
+        return dp;
+    }
+
     /**
      * In GUI mode, we can lookup the directory better
      */
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 28a224ba2ca..6a63aa72282 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -49,6 +49,7 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
     @FXML private CheckBox confirmDelete;
     @FXML private CheckBox shouldAskForIncludingCrossReferences;
     @FXML private CheckBox confirmHideTabBar;
+    @FXML private CheckBox donationNeverShow;
     @FXML private ComboBox<BibDatabaseMode> biblatexMode;
     @FXML private CheckBox alwaysReformatBib;
     @FXML private CheckBox autosaveLocalLibraries;
@@ -125,6 +126,7 @@ public void initialize() {
         confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
         shouldAskForIncludingCrossReferences.selectedProperty().bindBidirectional(viewModel.shouldAskForIncludingCrossReferences());
         confirmHideTabBar.selectedProperty().bindBidirectional(viewModel.confirmHideTabBarProperty());
+        donationNeverShow.selectedProperty().bindBidirectional(viewModel.donationNeverShowProperty());
 
         new ViewModelListCellFactory<BibDatabaseMode>()
                 .withText(BibDatabaseMode::getFormattedName)
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index fb753d849c8..beb2b7be4e2 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -84,6 +84,7 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
     private final BooleanProperty shouldAskForIncludingCrossReferencesProperty = new SimpleBooleanProperty();
     private final BooleanProperty hideTabBarProperty = new SimpleBooleanProperty();
+    private final BooleanProperty donationNeverShowProperty = new SimpleBooleanProperty();
 
     private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
     private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
@@ -210,6 +211,7 @@ public void setValues() {
         confirmDeleteProperty.setValue(workspacePreferences.shouldConfirmDelete());
         shouldAskForIncludingCrossReferencesProperty.setValue(preferences.getCopyToPreferences().getShouldAskForIncludingCrossReferences());
         hideTabBarProperty.setValue(workspacePreferences.shouldHideTabBar());
+        donationNeverShowProperty.setValue(preferences.getDonationPreferences().isNeverShowAgain());
 
         bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
         selectedBiblatexModeProperty.setValue(libraryPreferences.getDefaultBibDatabaseMode());
@@ -256,6 +258,7 @@ public void storeSettings() {
         workspacePreferences.setConfirmDelete(confirmDeleteProperty.getValue());
         preferences.getCopyToPreferences().setShouldAskForIncludingCrossReferences(shouldAskForIncludingCrossReferencesProperty.getValue());
         workspacePreferences.setHideTabBar(confirmHideTabBarProperty().getValue());
+        preferences.getDonationPreferences().setNeverShowAgain(donationNeverShowProperty.getValue());
 
         libraryPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
 
@@ -423,6 +426,10 @@ public BooleanProperty confirmHideTabBarProperty() {
         return this.hideTabBarProperty;
     }
 
+    public BooleanProperty donationNeverShowProperty() {
+        return this.donationNeverShowProperty;
+    }
+
     public ListProperty<BibDatabaseMode> biblatexModeListProperty() {
         return this.bibliographyModeListProperty;
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
new file mode 100644
index 00000000000..7d2c4749c45
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
@@ -0,0 +1,55 @@
+package org.jabref.gui.walkthrough.declarative.sideeffect;
+
+import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.gui.walkthrough.Walkthrough;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.search.SearchDisplayMode;
+import org.jabref.model.search.SearchFlags;
+
+import com.airhacks.afterburner.injection.Injector;
+import org.jspecify.annotations.NonNull;
+
+/// Ensures the search bar starts with unfiltered mode and regex disabled, then restores
+/// previous settings on exit.
+public class EnsureSearchSettingsSideEffect implements WalkthroughSideEffect {
+    private final boolean previousRegex;
+    private final boolean previousCaseSensitive;
+    private final SearchDisplayMode previousDisplayMode;
+
+    public EnsureSearchSettingsSideEffect() {
+        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
+        this.previousRegex = preferences.isRegularExpression();
+        this.previousCaseSensitive = preferences.isCaseSensitive();
+        this.previousDisplayMode = preferences.getSearchDisplayMode();
+    }
+
+    @Override
+    public @NonNull ExpectedCondition expectedCondition() {
+        return ExpectedCondition.ALWAYS_TRUE;
+    }
+
+    @Override
+    public boolean forward(@NonNull Walkthrough walkthrough) {
+        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
+        preferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, false);
+        preferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, false);
+        preferences.setSearchDisplayMode(SearchDisplayMode.FLOAT);
+        return true;
+    }
+
+    @Override
+    public boolean backward(@NonNull Walkthrough walkthrough) {
+        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
+        preferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, previousRegex);
+        preferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, previousCaseSensitive);
+        preferences.setSearchDisplayMode(previousDisplayMode);
+        return true;
+    }
+
+    @Override
+    public @NonNull String description() {
+        return Localization.lang("Prepare search settings");
+    }
+}
+
+
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
new file mode 100644
index 00000000000..d9351cd9db7
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
@@ -0,0 +1,158 @@
+package org.jabref.gui.welcome.components;
+
+import java.time.LocalDate;
+
+import javafx.animation.TranslateTransition;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.edit.OpenBrowserAction;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.gui.util.DelayedExecution;
+import org.jabref.gui.util.URLs;
+import org.jabref.logic.l10n.Localization;
+
+public class DonationProvider {
+    private static final int DONATION_INTERVAL_DAYS = 365;
+    private static final int DONATION_FIRST_BACKDATE_DAYS = 348;
+    private static final double DONATION_POPUP_ANIM_MS = 200;
+    private static final double DONATION_POPUP_TIMEOUT_SECONDS = 15;
+    private static final String DONATION_URL = URLs.DONATE_URL;
+
+    private final StackPane rootPane;
+    private final GuiPreferences preferences;
+    private final DialogService dialogService;
+    private HBox donationToast;
+    private DelayedExecution scheduledShow;
+
+    public DonationProvider(StackPane rootPane, GuiPreferences preferences, DialogService dialogService) {
+        this.rootPane = rootPane;
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+    }
+
+    public void showIfNeeded() {
+        if (preferences.getDonationPreferences().isNeverShowAgain()) {
+            return;
+        }
+        int lastShown = preferences.getDonationPreferences().getLastShownEpochDay();
+        int today = (int) LocalDate.now().toEpochDay();
+        if (lastShown < 0) {
+            // 7 days after first-launch, show the donation popup
+            preferences.getDonationPreferences().setLastShownEpochDay(today - DONATION_FIRST_BACKDATE_DAYS);
+            lastShown = preferences.getDonationPreferences().getLastShownEpochDay();
+        }
+        int daysSince = today - lastShown;
+        if (daysSince >= DONATION_INTERVAL_DAYS) {
+            preferences.getDonationPreferences().setLastShownEpochDay(today);
+            showToast();
+            scheduleAfterDays(DONATION_INTERVAL_DAYS);
+        } else {
+            scheduleAfterDays(DONATION_INTERVAL_DAYS - daysSince);
+        }
+    }
+
+    public void showToast() {
+        if (donationToast != null && rootPane.getChildren().contains(donationToast)) {
+            return;
+        }
+
+        Label title = new Label(Localization.lang("Support JabRef"));
+        title.getStyleClass().add("donation-toast-title");
+        Label subtitle = new Label(Localization.lang("Help us improve JabRef by donating."));
+        subtitle.getStyleClass().add("donation-toast-desc");
+        VBox textBox = new VBox(title, subtitle);
+        textBox.getStyleClass().add("donation-toast-text");
+
+        Node iconNode = IconTheme.JabRefIcons.DONATE.getGraphicNode();
+        HBox leftContent = new HBox(10, iconNode, textBox);
+        leftContent.setAlignment(Pos.CENTER_LEFT);
+
+        Button neverButton = new Button(Localization.lang("Never show again"));
+        neverButton.getStyleClass().add("donation-btn-ghost");
+        neverButton.setOnAction(_ -> {
+            preferences.getDonationPreferences().setNeverShowAgain(true);
+            hideToast();
+        });
+
+        Button cancelButton = new Button(Localization.lang("Cancel"));
+        cancelButton.getStyleClass().add("donation-btn-secondary");
+        cancelButton.setOnAction(_ -> hideToast());
+
+        Button donateButton = new Button(Localization.lang("Donate"));
+        donateButton.getStyleClass().add("donation-btn-primary");
+        donateButton.setDefaultButton(true);
+        donateButton.setOnAction(_ -> {
+            new OpenBrowserAction(DONATION_URL, dialogService, preferences.getExternalApplicationsPreferences()).execute();
+            hideToast();
+        });
+
+        HBox rightButtons = new HBox(8, neverButton, cancelButton, donateButton);
+        rightButtons.setAlignment(Pos.CENTER_RIGHT);
+
+        Region textSpacer = new Region();
+        HBox.setHgrow(textSpacer, Priority.ALWAYS);
+
+        donationToast = new HBox(leftContent, textSpacer, rightButtons);
+        donationToast.getStyleClass().add("donation-toast");
+        donationToast.setMaxWidth(Region.USE_PREF_SIZE);
+        donationToast.setMinWidth(Region.USE_PREF_SIZE);
+        donationToast.setTranslateY(-40);
+
+        StackPane.setAlignment(donationToast, Pos.TOP_CENTER);
+        StackPane.setMargin(donationToast, new Insets(16));
+        rootPane.getChildren().add(donationToast);
+
+        TranslateTransition slideDown = new TranslateTransition(Duration.millis(DONATION_POPUP_ANIM_MS), donationToast);
+        slideDown.setFromY(-40);
+        slideDown.setToY(0);
+        slideDown.play();
+
+        new DelayedExecution(Duration.seconds(DONATION_POPUP_TIMEOUT_SECONDS), this::hideToast).start();
+    }
+
+    private void hideToast() {
+        if (donationToast == null) {
+            return;
+        }
+        TranslateTransition slideUp = new TranslateTransition(Duration.millis(DONATION_POPUP_ANIM_MS), donationToast);
+        slideUp.setFromY(donationToast.getTranslateY());
+        slideUp.setToY(-40);
+        slideUp.setOnFinished(_ -> rootPane.getChildren().remove(donationToast));
+        slideUp.play();
+    }
+
+    /// Schedules the next donation popup after a specified number of days to take care
+    /// of situation where the user may leave the application open for an extended
+    /// period.
+    private void scheduleAfterDays(int days) {
+        cancelScheduled();
+        if (days <= 0) {
+            scheduledShow = new DelayedExecution(Duration.millis(1), this::showIfNeeded);
+        } else {
+            scheduledShow = new DelayedExecution(Duration.hours(days * 24), this::showIfNeeded);
+        }
+        scheduledShow.start();
+    }
+
+    private void cancelScheduled() {
+        if (scheduledShow != null) {
+            scheduledShow.cancel();
+            scheduledShow = null;
+        }
+    }
+}
+
+
+
diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index 4c0d017610a..691ab1d2148 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -1851,6 +1851,64 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-font-family: "Arial";
 }
 
+/* donation toast */
+.donation-toast {
+    -fx-background-color: -jr-background-alt;
+    -fx-background-radius: 0.8333333333em;
+    -fx-padding: 0.8333em 1em;
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.075), 20, 0.25, 0, 6);
+    -fx-alignment: center-left;
+    -fx-border-color: derive(-jr-base, -10%);
+    -fx-border-radius: 0.8333333333em;
+    -fx-max-height: 4em;
+    -fx-spacing: 1.16667em;
+}
+
+.donation-toast .label {
+    -fx-text-fill: -fx-text-base-color;
+}
+
+.donation-toast-title {
+    -fx-font-size: 1.0em;
+    -fx-font-weight: bold;
+}
+
+.donation-toast-desc {
+    -fx-font-size: 0.92em;
+}
+
+.donation-toast-text {
+    -fx-spacing: 2;
+}
+
+.donation-btn-primary,
+.donation-btn-secondary,
+.donation-btn-ghost {
+    -fx-padding: 0.5em 1em;
+    -fx-background-radius: 0.5em;
+    -fx-border-radius: 0.5em;
+}
+
+.donation-btn-primary {
+    -fx-background-color: -jr-primary;
+}
+
+.donation-btn-secondary {
+    -fx-background-color: derive(-fx-control-inner-background, -6%);
+}
+
+.donation-btn-ghost {
+    -fx-background-color: transparent;
+    -fx-text-fill: -jr-gray-1;
+    -fx-stroke-width: 0;
+    -fx-border-width: 0
+}
+
+.donation-btn-ghost:hover {
+    -fx-background-color: transparent;
+    -fx-text-fill: -jr-gray-2;
+}
+
 /* AboutDialog */
 #aboutDialog .about-heading {
     -fx-font-size: 30;
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index c54e43d5b34..7d62723b88d 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -1345,6 +1345,11 @@ Set\ read\ status\ to\ skimmed=Set read status to skimmed
 
 Donate\ to\ JabRef=Donate to JabRef
 Donation=Donation
+Support\ JabRef=Support JabRef
+Help\ us\ improve\ JabRef\ by\ donating.=Help us improve JabRef by donating.
+Never\ show\ again=Never show again
+Donate=Donate
+Do\ not\ show\ donation\ prompt\ again=Do not show donation prompt again
 
 Opens\ JabRef's\ GitHub\ page=Opens JabRef's GitHub page
 Opens\ JabRef's\ LinkedIn\ page=Opens JabRef's LinkedIn page

From 235b815ece83f451b2fd874103d2fac37feb245b Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:08:06 -0400
Subject: [PATCH 05/22] Add search walkthrough and responsive layout for
 WelcomeTab

---
 .../org/jabref/gui/frame/JabRefFrame.java     |   8 +-
 .../gui/preferences/GuiPreferences.java       |   3 +
 .../jabref/gui/search/GlobalSearchBar.java    |  30 +--
 .../gui/walkthrough/WalkthroughAction.java    | 166 ++++++++++++++-
 .../walkthrough/declarative/NodeResolver.java |  26 ++-
 .../org/jabref/gui/welcome/WelcomeTab.java    | 185 +++++++++--------
 .../gui/welcome/components/QuickSettings.java | 118 +++++++++--
 .../gui/welcome/components/Walkthroughs.java  | 104 ++++++++++
 .../main/resources/org/jabref/gui/Base.css    |  30 +--
 .../gui/preferences/general/GeneralTab.fxml   |   1 +
 .../gui/welcome/components/QuickSettings.fxml |  65 ------
 jablib/src/main/resources/SearchExamples.bib  | 194 ++++++++++++++++++
 .../main/resources/l10n/JabRef_en.properties  |  74 +++++++
 13 files changed, 793 insertions(+), 211 deletions(-)
 create mode 100644 jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
 delete mode 100644 jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
 create mode 100644 jablib/src/main/resources/SearchExamples.bib

diff --git a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index 815b92e8268..dfae60afdaf 100644
--- a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -48,6 +48,7 @@
 import org.jabref.gui.search.SearchType;
 import org.jabref.gui.sidepane.SidePane;
 import org.jabref.gui.sidepane.SidePaneType;
+import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
@@ -447,7 +448,8 @@ private void initBindings() {
     }
 
     private void updateTabBarVisible() {
-        if (preferences.getWorkspacePreferences().shouldHideTabBar() && stateManager.getOpenDatabases().size() <= 1) {
+        // When WelcomeTab is open, the tabbar should be visible
+        if (preferences.getWorkspacePreferences().shouldHideTabBar() && tabbedPane.getTabs().size() <= 1) {
             if (!tabbedPane.getStyleClass().contains("hide-tab-bar")) {
                 tabbedPane.getStyleClass().add("hide-tab-bar");
             }
@@ -507,7 +509,9 @@ public void showWelcomeTab() {
                 clipBoardManager,
                 taskExecutor,
                 fileHistory,
-                Injector.instantiateModelOrService(BuildInfo.class)
+                Injector.instantiateModelOrService(BuildInfo.class),
+                preferences.getWorkspacePreferences(),
+                Injector.instantiateModelOrService(ThemeManager.class)
         );
         tabbedPane.getTabs().add(welcomeTab);
         tabbedPane.getSelectionModel().select(welcomeTab);
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
index 6e1faaded08..0b7e2acdf9e 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
@@ -19,6 +19,7 @@
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.push.PushToApplicationPreferences;
+import org.jabref.gui.preferences.DonationPreferences;
 
 public interface GuiPreferences extends CliPreferences {
     CopyToPreferences getCopyToPreferences();
@@ -58,4 +59,6 @@ public interface GuiPreferences extends CliPreferences {
     KeyBindingRepository getKeyBindingRepository();
 
     NewEntryPreferences getNewEntryPreferences();
+
+    DonationPreferences getDonationPreferences();
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index b9e69dd464f..95471f3b520 100644
--- a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -275,24 +275,32 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        regexButton.selectedProperty().bind(Bindings.createBooleanBinding(
-                () -> searchPreferences.getObservableSearchFlags().contains(SearchFlags.REGULAR_EXPRESSION),
-                searchPreferences.getObservableSearchFlags()
-        ));
+        regexButton.setSelected(searchPreferences.isRegularExpression());
         regexButton.setTooltip(new Tooltip(Localization.lang("Regular expression") + "\n" + Localization.lang("This only affects unfielded terms. For using RegEx in a fielded term, use =~ operator.")));
         initSearchModifierButton(regexButton);
+        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchFlags>) change -> {
+            if (change.wasAdded() && change.getElementAdded() == SearchFlags.REGULAR_EXPRESSION) {
+                regexButton.setSelected(true);
+            } else if (change.wasRemoved() && change.getElementRemoved() == SearchFlags.REGULAR_EXPRESSION) {
+                regexButton.setSelected(false);
+            }
+        });
         regexButton.setOnAction(_ -> {
             searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, regexButton.isSelected());
             searchField.requestFocus();
             updateSearchQuery();
         });
 
-        caseSensitiveButton.selectedProperty().bind(Bindings.createBooleanBinding(
-                () -> searchPreferences.getObservableSearchFlags().contains(SearchFlags.CASE_SENSITIVE),
-                searchPreferences.getObservableSearchFlags()
-        ));
+        caseSensitiveButton.setSelected(searchPreferences.isCaseSensitive());
         caseSensitiveButton.setTooltip(new Tooltip(Localization.lang("Case sensitive") + "\n" + Localization.lang("This only affects unfielded terms. For using case-sensitive in a fielded term, use =! operator.")));
         initSearchModifierButton(caseSensitiveButton);
+        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchFlags>) change -> {
+            if (change.wasAdded() && change.getElementAdded() == SearchFlags.CASE_SENSITIVE) {
+                caseSensitiveButton.setSelected(true);
+            } else if (change.wasRemoved() && change.getElementRemoved() == SearchFlags.CASE_SENSITIVE) {
+                caseSensitiveButton.setSelected(false);
+            }
+        });
         caseSensitiveButton.setOnAction(_ -> {
             searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, caseSensitiveButton.isSelected());
             searchField.requestFocus();
@@ -304,12 +312,10 @@ private void initSearchModifierButtons() {
         initSearchModifierButton(keepSearchString);
         keepSearchString.selectedProperty().addListener((_, _, _) -> searchField.requestFocus());
 
-        filterModeButton.selectedProperty().bind(Bindings.createBooleanBinding(
-                () -> searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER,
-                searchPreferences.searchDisplayModeProperty()
-        ));
+        filterModeButton.setSelected(searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER);
         filterModeButton.setTooltip(new Tooltip(Localization.lang("Filter search results")));
         initSearchModifierButton(filterModeButton);
+        searchPreferences.searchDisplayModeProperty().addListener((_, _, newVal) -> filterModeButton.setSelected(newVal == SearchDisplayMode.FILTER));
         filterModeButton.setOnAction(_ -> {
             searchPreferences.setSearchDisplayMode(filterModeButton.isSelected() ? SearchDisplayMode.FILTER : SearchDisplayMode.FLOAT);
             searchField.requestFocus();
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index beaeb480972..4948057fec1 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -16,6 +16,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.preferences.PreferencesDialogView;
+import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.walkthrough.declarative.NodeResolver;
 import org.jabref.gui.walkthrough.declarative.Trigger;
 import org.jabref.gui.walkthrough.declarative.WindowResolver;
@@ -24,6 +25,7 @@
 import org.jabref.gui.walkthrough.declarative.effect.WindowEffect;
 import org.jabref.gui.walkthrough.declarative.richtext.InfoBlock;
 import org.jabref.gui.walkthrough.declarative.richtext.TextBlock;
+import org.jabref.gui.walkthrough.declarative.sideeffect.EnsureSearchSettingsSideEffect;
 import org.jabref.gui.walkthrough.declarative.sideeffect.OpenLibrarySideEffect;
 import org.jabref.gui.walkthrough.declarative.step.PanelPosition;
 import org.jabref.gui.walkthrough.declarative.step.QuitButtonPosition;
@@ -31,11 +33,14 @@
 import org.jabref.gui.walkthrough.declarative.step.WalkthroughStep;
 import org.jabref.logic.l10n.Localization;
 
+import org.controlsfx.control.textfield.CustomTextField;
+
 public class WalkthroughAction extends SimpleCommand {
     public static final String PDF_LINK_WALKTHROUGH_NAME = "pdfLink";
     public static final String MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME = "mainFileDirectory";
     public static final String CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME = "customizeEntryTable";
     public static final String GROUP_WALKTHROUGH_NAME = "group";
+    public static final String SEARCH_WALKTHROUGH_NAME = "search";
 
     private static final Map<String, Walkthrough> WALKTHROUGH_CACHE = new ConcurrentHashMap<>();
 
@@ -65,6 +70,7 @@ private Walkthrough getWalkthrough(String name) {
                     case CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME ->
                             createCustomizeEntryTableWalkthrough();
                     case GROUP_WALKTHROUGH_NAME -> createGroupWalkthrough();
+                    case SEARCH_WALKTHROUGH_NAME -> createSearchWalkthrough();
                     default ->
                             throw new IllegalArgumentException("Unknown walkthrough: " + name);
                 }
@@ -312,11 +318,11 @@ private Walkthrough createGroupWalkthrough() {
                 .create(stateManager)
                 // Step 1: Open example library
                 .addStep(WalkthroughStep.sideEffect(Localization.lang("Open Example Library"))
-                        .sideEffect(new OpenLibrarySideEffect(frame)))
+                                        .sideEffect(new OpenLibrarySideEffect(frame)))
                 // Step 2: Highlight groups sidepane
                 .addStep(WalkthroughStep
                         .panel(Localization.lang("Welcome to groups walkthrough"))
-                    .content(
+                        .content(
                                 new TextBlock(Localization.lang("This walkthrough will guide you through creating and managing groups in JabRef. Groups help you organize your bibliography entries into collections. We've opened an example library so you can practice with real entries.")),
                                 new InfoBlock(Localization.lang("The groups panel on the left side shows all your groups in a tree structure. You can create groups, add entries to them, and organize them hierarchically."))
                         )
@@ -433,6 +439,162 @@ private Walkthrough createGroupWalkthrough() {
                 .build();
     }
 
+    private Walkthrough createSearchWalkthrough() {
+        NodeResolver searchFieldResolver = scene -> NodeResolver
+                .predicate(GlobalSearchBar.class::isInstance)
+                .resolve(scene)
+                .flatMap(node -> node instanceof GlobalSearchBar bar ?
+                        bar.getChildren().stream().filter(CustomTextField.class::isInstance).findAny() :
+                        Optional.empty());
+
+        return Walkthrough
+                .create(stateManager)
+                // Step 1: Open example library
+                .addStep(WalkthroughStep.sideEffect(Localization.lang("Open Example Library"))
+                                        .sideEffect(new OpenLibrarySideEffect(frame, "SearchExamples.bib")))
+                // Step 1b: Ensure initial search settings
+                .addStep(WalkthroughStep.sideEffect(Localization.lang("Prepare search settings"))
+                                        .sideEffect(new EnsureSearchSettingsSideEffect()))
+                // Step 2: Introduction
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Welcome to the search walkthrough"))
+                        .content(
+                                new TextBlock(Localization.lang("This walkthrough will guide you through JabRef's search capabilities. We've loaded a sample library to demonstrate various search techniques."))
+                        )
+                        .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("MainTable")))
+                        .continueButton(Localization.lang("Continue"))
+                        .position(PanelPosition.BOTTOM)
+                        .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 3: Focus on GlobalSearchBar
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Click in the search field to begin"))
+                        .content(new InfoBlock(Localization.lang("You can also use `Ctrl+F` or `Cmd+F` to focus the search field.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 4-7: Simple text search
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `machine learning`"))
+                        .content(new TextBlock(Localization.lang("As you type, JabRef instantly dims all non-matching entries. By default, searches are case-insensitive and look through all fields like title, author, abstract, and keywords.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextEquals("machine learning"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Understanding search results"))
+                        .content(
+                                new TextBlock(Localization.lang("Notice how entries not containing \"machine learning\" are dimmed.")),
+                                new InfoBlock(Localization.lang("This found entries with at least a field in their metadata (*e.g.,* title, author, abstract, *etc.*) containing \"machine learning\"."))
+                        )
+                        .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("MainTable")))
+                        .continueButton(Localization.lang("Continue"))
+                        .position(PanelPosition.RIGHT)
+                        .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT)
+                        .highlight(HighlightEffect.NONE))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Toggle filter mode to hide non-matching entries"))
+                        .content(new TextBlock(Localization.lang("Filter mode shows only matching entries, hiding everything else.")))
+                        .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.FILTER))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Clear the search to see all entries again"))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextEquals(""))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 8: Field-specific search
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `author = Son`"))
+                        .content(
+                                new TextBlock(Localization.lang("The equals sign (`=`) means \"contains\" and is case-insensitive by default.")),
+                                new InfoBlock(Localization.lang("This query finds all papers where any author's name contains \"Son,\" including \"Maddison,\" \"Watson, J.,\" or \"Matson, Robert P.\". It won't match \"Son\" appearing in titles or abstracts."))
+                        )
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)\\s*author\\s*=\\s*son\\s*"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 9: Exact field matching
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `date == 2023`"))
+                        .content(new TextBlock(Localization.lang("The double equals (`==`) means exact match, not just contains. This query finds only papers with field \"date\" exactly in 2023.")),
+                                new InfoBlock(Localization.lang("With single equals (*e.g.,* `date = 23`), you'd also match dates like 1923 or 2230.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)\\s*date\\s*==\\s*2023\\s*"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 10: Combining search terms with AND
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `shortauthor = WHO AND date == 2023`"))
+                        .content(new TextBlock(Localization.lang("This query finds papers by WHO from 2023. `AND` requires both conditions to be true.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)shortauthor\\s*=\\s*WHO\\s+AND\\s+date\\s*==\\s*2023|date\\s*==\\s*2023\\s+AND\\s+shortauthor\\s*=\\s*WHO"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 11: Using OR for alternatives
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `title = covid OR title = pandemic`"))
+                        .content(new TextBlock(Localization.lang("This query finds paper with title containing either COVID or pandemics in general.")),
+                                new InfoBlock(Localization.lang("`OR` can be satisified with either of the conditions being true.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)title\\s*=\\s*covid\\s+OR\\s+title\\s*=\\s*pandemic|title\\s*=\\s*pandemic\\s+OR\\s+title\\s*=\\s*covid"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 12: Negation with NOT
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `deep learning NOT title = survey`"))
+                        .content(new TextBlock(Localization.lang("This query finds entries with \"deep learning\" in its metadata, but not \"survey\" in the title.")),
+                                new InfoBlock(Localization.lang("NOT helps you filter out unwanted results.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)deep\\s+learning\\s+NOT\\s+title\\s*=\\s*survey"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 13: Regex
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Enable regular expressions for pattern matching"))
+                        .content(new TextBlock(Localization.lang("Regular expressions allow sophisticated pattern matching. Click this button to enable regex mode for advanced searches.")))
+                        .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.REG_EX))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 14: Using regex patterns
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `title =~ \\(deep|machine\\) learning`"))
+                        .content(new TextBlock(Localization.lang("The `=~` operator explicitly uses regex. The pipe operator `|` allows `(deep|machine)` matches either word (deep or machine). This finds \"deep learning\" and \"machine learning\" but not \"learning\" alone.")),
+                                new InfoBlock(Localization.lang("Click on the regex button on previous step enables regex mode, allowing you to type `\\(deep|machine\\) learning` directly to search for any entry with metadata matching the regex. If you use `=~`, regardless of whether regex mode is enabled, it will always treat the search as a regex.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)title\\s*=~\\s*\\\\\\(deep\\|machine\\\\\\)\\s*learning"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 15-16: Case sensitivity
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Enable case-sensitive searching"))
+                        .content(new TextBlock(Localization.lang("This is useful when case matters, like distinguishing \"WHO\" (World Health Organization) from \"who\".")))
+                        .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.CASE_SENSITIVE))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `WHO`"))
+                        .content(new TextBlock(Localization.lang("This query finds entries with capital WHO only. With case sensitivity on, this won't match \"who\" or \"Who\".")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextEquals("WHO"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 17: Completion
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Search walkthrough completed"))
+                        .content(new TextBlock(Localization.lang("**Quick reference:**\n- Press **Ctrl+F** to jump to search\n- Use **field = value** for field searches\n- Combine with **AND**, **OR**, **NOT**\n- Enable **regex** for pattern matching")),
+                                new InfoBlock(Localization.lang("For complete search documentation and more examples, visit [Search documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/search)")))
+                        .continueButton(Localization.lang("Finish"))
+                        .position(PanelPosition.RIGHT)
+                        .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT))
+                .build();
+    }
+
     private Walkthrough createMainFileDirectoryWalkthrough() {
         WindowResolver mainResolver = () -> Optional.of(stage);
         WalkthroughEffect preferenceHighlight = new WalkthroughEffect(
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
index 1d82ce74584..0b4948df3a1 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
@@ -7,6 +7,7 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBase;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.DialogPane;
@@ -17,9 +18,11 @@
 import org.jabref.gui.icon.JabRefIconView;
 import org.jabref.logic.l10n.Localization;
 
+import com.google.common.collect.Streams;
 import com.sun.javafx.scene.control.LabeledText;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
+import org.kordamp.ikonli.javafx.FontIcon;
 
 /// Resolves nodes from a Scene
 @FunctionalInterface
@@ -41,7 +44,7 @@ static NodeResolver selector(@NonNull String selector) {
     /// Creates a resolver that finds a node by its fx:id.
     ///
     /// @param fxId the fx:id of the node
-    /// @return a resolver that finds the node by fx:id
+    /// @returWn a resolver that finds the node by fx:id
     static NodeResolver fxId(@NonNull String fxId) {
         return scene -> Optional.ofNullable(scene.lookup("#" + fxId));
     }
@@ -51,12 +54,17 @@ static NodeResolver fxId(@NonNull String fxId) {
     /// @param glyph the graphic of the button
     /// @return a resolver that finds the button by graphic
     static NodeResolver buttonWithGraphic(IconTheme.JabRefIcons glyph) {
-        return scene -> scene.getRoot().lookupAll(".button").stream()
-                             .filter(node -> node instanceof Button button
-                                     && Optional.ofNullable(findNode(button.getGraphic(), JabRefIconView.class::isInstance))
-                                                .map(JabRefIconView.class::cast).filter(icon -> icon.getGlyph() == glyph)
-                                                .isPresent())
-                             .findFirst();
+        return scene -> Streams.concat(scene.getRoot().lookupAll(".button").stream(),
+                                       scene.getRoot().lookupAll(".icon-button").stream())
+                               .filter(node -> {
+                                   if (!(node instanceof ButtonBase button)) {
+                                       return false;
+                                   }
+                                   Node graphic = button.getGraphic();
+                                   return (graphic instanceof JabRefIconView jabRefIconView) && jabRefIconView.getGlyph() == glyph ||
+                                           (graphic instanceof FontIcon fontIcon) && fontIcon.getIconCode() == glyph.getIkon();
+                               })
+                               .findFirst();
     }
 
     /// Creates a resolver that finds a node by a predicate.
@@ -82,8 +90,8 @@ static NodeResolver action(@NonNull StandardActions action) {
     /// @return a resolver that finds the button by button type
     static NodeResolver buttonType(@NonNull ButtonType buttonType) {
         return scene -> predicate(DialogPane.class::isInstance)
-                                .resolve(scene)
-                                .map(node -> node instanceof DialogPane pane ? pane.lookupButton(buttonType) : null);
+                .resolve(scene)
+                .map(node -> node instanceof DialogPane pane ? pane.lookupButton(buttonType) : null);
     }
 
     /// Creates a resolver that finds a node by selector first, then predicate.
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index fe509968d7d..a9fb1d0d967 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -7,15 +7,17 @@
 import javafx.collections.ListChangeListener;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.Button;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
+import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
@@ -24,6 +26,7 @@
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.edit.OpenBrowserAction;
 import org.jabref.gui.frame.FileHistoryMenu;
@@ -31,10 +34,12 @@
 import org.jabref.gui.importer.NewDatabaseAction;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.URLs;
-import org.jabref.gui.walkthrough.WalkthroughAction;
+import org.jabref.gui.welcome.components.DonationProvider;
 import org.jabref.gui.welcome.components.QuickSettings;
+import org.jabref.gui.welcome.components.Walkthroughs;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -66,6 +71,11 @@ public class WelcomeTab extends Tab {
     private final FileHistoryMenu fileHistoryMenu;
     private final BuildInfo buildInfo;
     private final Stage stage;
+    private final WorkspacePreferences workspacePreferences;
+    private final ThemeManager themeManager;
+    private Walkthroughs walkthroughs;
+
+    private QuickSettings quickSettings;
 
     public WelcomeTab(Stage stage,
                       LibraryTabContainer tabContainer,
@@ -79,7 +89,9 @@ public WelcomeTab(Stage stage,
                       ClipBoardManager clipBoardManager,
                       TaskExecutor taskExecutor,
                       FileHistoryMenu fileHistoryMenu,
-                      BuildInfo buildInfo) {
+                      BuildInfo buildInfo,
+                      WorkspacePreferences workspacePreferences,
+                      ThemeManager themeManager) {
         super(Localization.lang("Welcome"));
         setClosable(true);
         this.tabContainer = tabContainer;
@@ -95,27 +107,27 @@ public WelcomeTab(Stage stage,
         this.fileHistoryMenu = fileHistoryMenu;
         this.buildInfo = buildInfo;
         this.stage = stage;
+        this.workspacePreferences = workspacePreferences;
+        this.themeManager = themeManager;
         this.recentLibrariesBox = new VBox();
         recentLibrariesBox.getStyleClass().add("welcome-recent-libraries");
 
-        VBox mainContainer = new VBox(createTopTitles(), createColumnsContainer(), createCommunityBox());
-        mainContainer.getStyleClass().add("welcome-main-container");
+        Node titles = createTopTitles();
+        Node communityBox = createCommunityBox();
+        ScrollPane columnsScroll = createColumnsContainerScrollable();
 
-        VBox container = new VBox();
-        container.getChildren().add(mainContainer);
-        VBox.setVgrow(mainContainer, Priority.ALWAYS);
+        VBox mainStack = new VBox(titles, columnsScroll, communityBox);
+        mainStack.getStyleClass().add("welcome-main-container");
+        VBox.setVgrow(columnsScroll, Priority.ALWAYS);
+
+        VBox container = new VBox(mainStack);
         container.setAlignment(Pos.CENTER);
 
-        setContent(container);
-    }
+        StackPane rootPane = new StackPane(container);
+        setContent(rootPane);
 
-    private Button createWalkthroughButton(String text, IconTheme.JabRefIcons icon, String walkthroughId) {
-        Button button = new Button(text);
-        button.setGraphic(icon.getGraphicNode());
-        button.getStyleClass().add("quick-settings-button");
-        button.setMaxWidth(Double.MAX_VALUE);
-        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, walkthroughId).execute());
-        return button;
+        DonationProvider donationProvider = new DonationProvider(rootPane, preferences, dialogService);
+        donationProvider.showIfNeeded();
     }
 
     private VBox createTopTitles() {
@@ -123,23 +135,31 @@ private VBox createTopTitles() {
         welcomeLabel.getStyleClass().add("welcome-label");
         Label descriptionLabel = new Label(Localization.lang("Stay on top of your literature"));
         descriptionLabel.getStyleClass().add("welcome-description-label");
-        VBox topTitles = new VBox();
+        VBox topTitles = new VBox(welcomeLabel, descriptionLabel);
         topTitles.getStyleClass().add("welcome-top-titles");
-        topTitles.getChildren().addAll(welcomeLabel, descriptionLabel);
         return topTitles;
     }
 
-    private HBox createColumnsContainer() {
+    private ScrollPane createColumnsContainerScrollable() {
+        GridPane grid = new GridPane();
+        grid.getStyleClass().add("welcome-columns-container");
+
         VBox leftColumn = createLeftColumn();
+        GridPane.setHgrow(leftColumn, Priority.ALWAYS);
+
         VBox rightColumn = createRightColumn();
-        HBox columnsContainer = new HBox();
-        columnsContainer.getStyleClass().add("welcome-columns-container");
-        leftColumn.getStyleClass().add("welcome-left-column");
-        rightColumn.getStyleClass().add("welcome-right-column");
-        HBox.setHgrow(leftColumn, Priority.ALWAYS);
-        HBox.setHgrow(rightColumn, Priority.ALWAYS);
-        columnsContainer.getChildren().addAll(leftColumn, rightColumn);
-        return columnsContainer;
+        GridPane.setHgrow(rightColumn, Priority.ALWAYS);
+
+        Runnable applyLayout = () -> updateColumnsLayout(grid, leftColumn, rightColumn, grid.getWidth());
+        grid.widthProperty().addListener((_, _, _) -> applyLayout.run());
+        applyLayout.run();
+
+        ScrollPane scrollPane = new ScrollPane(grid);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.getStyleClass().add("welcome-columns-scroll");
+        return scrollPane;
     }
 
     private VBox createLeftColumn() {
@@ -152,68 +172,39 @@ private VBox createLeftColumn() {
     }
 
     private VBox createRightColumn() {
-        VBox rightColumn = new VBox(new QuickSettings(), createWalkthroughBox());
+        this.quickSettings = new QuickSettings(preferences, dialogService, taskExecutor, themeManager);
+        this.walkthroughs = new Walkthroughs(stage, tabContainer, stateManager);
+        VBox rightColumn = new VBox(quickSettings, walkthroughs);
         rightColumn.getStyleClass().add("welcome-content-column");
+        VBox.setVgrow(quickSettings, Priority.ALWAYS);
+        VBox.setVgrow(walkthroughs, Priority.ALWAYS);
         return rightColumn;
     }
 
-    private VBox createWalkthroughBox() {
-        Label header = new Label(Localization.lang("Walkthroughs"));
-        header.getStyleClass().add("welcome-header-label");
-
-        VBox walkthroughsContainer = new VBox();
-        walkthroughsContainer.getStyleClass().add("walkthroughs-container");
-
-        Button mainFileDirWalkthroughButton = createWalkthroughButton(
-                Localization.lang("Set main file directory"),
-                IconTheme.JabRefIcons.FOLDER,
-                WalkthroughAction.MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME
-        );
-
-        Button entryTableWalkthroughButton = createWalkthroughButton(
-                Localization.lang("Customize entry table"),
-                IconTheme.JabRefIcons.TOGGLE_GROUPS,
-                WalkthroughAction.CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME
-        );
-
-        Button linkPdfWalkthroughButton = createWalkthroughButton(
-                Localization.lang("Link PDF to entries"),
-                IconTheme.JabRefIcons.PDF_FILE,
-                WalkthroughAction.PDF_LINK_WALKTHROUGH_NAME
-        );
-
-        Button groupButton = createWalkthroughButton(
-                Localization.lang("Add group"),
-                IconTheme.JabRefIcons.NEW_GROUP,
-                WalkthroughAction.GROUP_WALKTHROUGH_NAME
-        );
-
-        walkthroughsContainer.getChildren().addAll(
-                mainFileDirWalkthroughButton,
-                entryTableWalkthroughButton,
-                linkPdfWalkthroughButton,
-                groupButton
-        );
-
-        ScrollPane scrollPane = new ScrollPane(walkthroughsContainer);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.getStyleClass().add("walkthroughs-scroll-pane");
-
-        return createVBoxContainer(header, scrollPane);
-    }
-
-    private VBox createCommunityBox() {
-        Label header = new Label(Localization.lang("Community"));
-        header.getStyleClass().add("welcome-header-label");
-        FlowPane iconLinksContainer = createIconLinksContainer();
-        HBox textLinksContainer = createTextLinksContainer();
-        HBox versionContainer = createVersionContainer();
-        VBox container = new VBox();
-        container.getStyleClass().add("welcome-community-content");
-        container.getChildren().addAll(iconLinksContainer, textLinksContainer, versionContainer);
-        return createVBoxContainer(header, container);
+    private void updateColumnsLayout(GridPane grid, VBox leftColumn, VBox rightColumn, double availableWidth) {
+        grid.getChildren().clear();
+        grid.getColumnConstraints().clear();
+
+        double threshold = 48 * workspacePreferences.getMainFontSize();
+        if (availableWidth < threshold) {
+            grid.getStyleClass().add("compact");
+            ColumnConstraints single = new ColumnConstraints();
+            single.setPercentWidth(100);
+            grid.getColumnConstraints().add(single);
+            grid.add(leftColumn, 0, 0);
+            grid.add(rightColumn, 0, 1);
+            quickSettings.disableScroll();
+            walkthroughs.disableScroll();
+        } else {
+            grid.getStyleClass().remove("compact");
+            ColumnConstraints half = new ColumnConstraints();
+            half.setPercentWidth(50);
+            grid.getColumnConstraints().addAll(half, half);
+            grid.add(leftColumn, 0, 0);
+            grid.add(rightColumn, 1, 0);
+            quickSettings.enableScroll();
+            walkthroughs.enableScroll();
+        }
     }
 
     private VBox createWelcomeStartBox() {
@@ -299,11 +290,16 @@ private void displayNoRecentLibrariesMessage() {
         fileHistoryMenu.setDisable(true);
     }
 
-    private VBox createVBoxContainer(Node... nodes) {
-        VBox box = new VBox();
-        box.getStyleClass().add("welcome-section");
-        box.getChildren().addAll(nodes);
-        return box;
+    private VBox createCommunityBox() {
+        Label header = new Label(Localization.lang("Community"));
+        header.getStyleClass().add("welcome-header-label");
+        FlowPane iconLinksContainer = createIconLinksContainer();
+        HBox textLinksContainer = createTextLinksContainer();
+        HBox versionContainer = createVersionContainer();
+        VBox container = new VBox();
+        container.getStyleClass().add("welcome-community-content");
+        container.getChildren().addAll(iconLinksContainer, textLinksContainer, versionContainer);
+        return createVBoxContainer(header, container);
     }
 
     private FlowPane createIconLinksContainer() {
@@ -363,4 +359,11 @@ private HBox createVersionContainer() {
         container.getChildren().add(versionLabel);
         return container;
     }
+
+    private VBox createVBoxContainer(Node... nodes) {
+        VBox box = new VBox();
+        box.getStyleClass().add("welcome-section");
+        box.getChildren().addAll(nodes);
+        return box;
+    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java
index f496a101dc4..f853151d6fe 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java
@@ -1,9 +1,12 @@
 package org.jabref.gui.welcome.components;
 
-import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.welcome.quicksettings.EntryTableConfigurationDialog;
@@ -12,49 +15,128 @@
 import org.jabref.gui.welcome.quicksettings.OnlineServicesDialog;
 import org.jabref.gui.welcome.quicksettings.PushApplicationDialog;
 import org.jabref.gui.welcome.quicksettings.ThemeDialog;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class QuickSettings extends VBox {
-    @Inject private GuiPreferences preferences;
-    @Inject private DialogService dialogService;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private ThemeManager themeManager;
+    private final GuiPreferences preferences;
+    private final DialogService dialogService;
+    private final TaskExecutor taskExecutor;
+
+    private final ThemeManager themeManager;
+    private final Label header;
+    private boolean isScrollEnabled = true;
+
+    public QuickSettings(GuiPreferences preferences, DialogService dialogService, TaskExecutor taskExecutor, ThemeManager themeManager) {
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+        this.taskExecutor = taskExecutor;
+        this.themeManager = themeManager;
+
+        getStyleClass().add("welcome-section");
+
+        header = new Label(Localization.lang("Quick settings"));
+        header.getStyleClass().add("welcome-header-label");
+        enableScroll();
+    }
+
+    public void enableScroll() {
+        if (isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = true;
+        getChildren().clear();
+        getChildren().addAll(header, createScrollPane(createContent()));
+    }
+
+    public void disableScroll() {
+        if (!isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = false;
+        getChildren().clear();
+        getChildren().addAll(header, createContent());
+    }
+
+    private VBox createContent() {
+        Button mainFileDirButton = createButton(
+                Localization.lang("Set main file directory"),
+                IconTheme.JabRefIcons.FOLDER,
+                this::showMainFileDirectoryDialog);
+
+        Button themeButton = createButton(
+                Localization.lang("Change visual theme"),
+                IconTheme.JabRefIcons.PREFERENCES,
+                this::showThemeDialog);
+
+        Button largeLibraryButton = createButton(
+                Localization.lang("Optimize for large libraries"),
+                IconTheme.JabRefIcons.SELECTORS,
+                this::showLargeLibraryOptimizationDialog);
+
+        Button pushApplicationButton = createButton(
+                Localization.lang("Configure push to applications"),
+                IconTheme.JabRefIcons.APPLICATION_GENERIC,
+                this::showPushApplicationConfigurationDialog);
+
+        Button onlineServicesButton = createButton(
+                Localization.lang("Configure web search services"),
+                IconTheme.JabRefIcons.WWW,
+                this::showOnlineServicesConfigurationDialog);
+
+        Button entryTableButton = createButton(
+                Localization.lang("Customize entry table"),
+                IconTheme.JabRefIcons.TOGGLE_GROUPS,
+                this::showEntryTableConfigurationDialog);
+
+        VBox newContent = new VBox(mainFileDirButton,
+                                 themeButton,
+                                 largeLibraryButton,
+                                 entryTableButton,
+                                 pushApplicationButton,
+                                 onlineServicesButton);
+        newContent.getStyleClass().add("quick-settings-container");
+        return newContent;
+    }
+
+    private ScrollPane createScrollPane(VBox contentPane) {
+        ScrollPane newScrollPane = new ScrollPane(contentPane);
+        newScrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        newScrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        newScrollPane.setFitToWidth(true);
+        newScrollPane.getStyleClass().add("quick-settings-scroll-pane");
+        return newScrollPane;
+    }
 
-    public QuickSettings() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    private Button createButton(String text, IconTheme.JabRefIcons icon, Runnable action) {
+        Button button = new Button(text);
+        button.setGraphic(icon.getGraphicNode());
+        button.getStyleClass().add("quick-settings-button");
+        button.setMaxWidth(Double.MAX_VALUE);
+        button.setOnAction(event -> action.run());
+        return button;
     }
 
-    @FXML
     private void showMainFileDirectoryDialog() {
         dialogService.showCustomDialogAndWait(new MainFileDirectoryDialog(preferences, dialogService, themeManager));
     }
 
-    @FXML
     private void showThemeDialog() {
         dialogService.showCustomDialogAndWait(new ThemeDialog(preferences, dialogService, themeManager));
     }
 
-    @FXML
     private void showLargeLibraryOptimizationDialog() {
         dialogService.showCustomDialogAndWait(new LargeLibraryOptimizationDialog(preferences, themeManager));
     }
 
-    @FXML
     private void showPushApplicationConfigurationDialog() {
         dialogService.showCustomDialogAndWait(new PushApplicationDialog(preferences, dialogService, taskExecutor, themeManager));
     }
 
-    @FXML
     private void showOnlineServicesConfigurationDialog() {
         dialogService.showCustomDialogAndWait(new OnlineServicesDialog(preferences, themeManager));
     }
 
-    @FXML
     private void showEntryTableConfigurationDialog() {
         dialogService.showCustomDialogAndWait(new EntryTableConfigurationDialog(preferences, themeManager));
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
new file mode 100644
index 00000000000..6a45cb04a3f
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
@@ -0,0 +1,104 @@
+package org.jabref.gui.welcome.components;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+
+import org.jabref.gui.LibraryTabContainer;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.walkthrough.WalkthroughAction;
+import org.jabref.logic.l10n.Localization;
+
+public class Walkthroughs extends VBox {
+    private final Stage stage;
+    private final LibraryTabContainer tabContainer;
+    private final StateManager stateManager;
+
+    private final Label header;
+    private boolean isScrollEnabled = true;
+
+    public Walkthroughs(Stage stage, LibraryTabContainer tabContainer, StateManager stateManager) {
+        this.stage = stage;
+        this.tabContainer = tabContainer;
+        this.stateManager = stateManager;
+
+        getStyleClass().add("welcome-section");
+
+        header = new Label(Localization.lang("Walkthroughs"));
+        header.getStyleClass().add("welcome-header-label");
+        enableScroll();
+    }
+
+    public void enableScroll() {
+        if (isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = true;
+        getChildren().clear();
+        getChildren().addAll(header, createScrollPane(createWalkthroughContent()));
+    }
+
+    public void disableScroll() {
+        if (!isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = false;
+        getChildren().clear();
+        getChildren().addAll(header, createWalkthroughContent());
+    }
+
+    private VBox createWalkthroughContent() {
+        VBox content = new VBox();
+        content.getStyleClass().add("walkthroughs-container");
+
+        Button mainFileDirWalkthroughButton = createWalkthroughButton(
+                Localization.lang("Set main file directory"),
+                IconTheme.JabRefIcons.FOLDER,
+                WalkthroughAction.MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME);
+        Button entryTableWalkthroughButton = createWalkthroughButton(
+                Localization.lang("Customize entry table"),
+                IconTheme.JabRefIcons.TOGGLE_GROUPS,
+                WalkthroughAction.CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME);
+        Button linkPdfWalkthroughButton = createWalkthroughButton(
+                Localization.lang("Link PDF to entries"),
+                IconTheme.JabRefIcons.PDF_FILE,
+                WalkthroughAction.PDF_LINK_WALKTHROUGH_NAME);
+        Button groupButton = createWalkthroughButton(
+                Localization.lang("Add group"),
+                IconTheme.JabRefIcons.NEW_GROUP,
+                WalkthroughAction.GROUP_WALKTHROUGH_NAME);
+        Button searchButton = createWalkthroughButton(
+                Localization.lang("Search your library"),
+                IconTheme.JabRefIcons.SEARCH,
+                WalkthroughAction.SEARCH_WALKTHROUGH_NAME);
+
+        content.getChildren().addAll(
+                mainFileDirWalkthroughButton,
+                entryTableWalkthroughButton,
+                linkPdfWalkthroughButton,
+                groupButton,
+                searchButton);
+        return content;
+    }
+
+    private ScrollPane createScrollPane(VBox content) {
+        ScrollPane newScrollPane = new ScrollPane(content);
+        newScrollPane.setFitToWidth(true);
+        newScrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        newScrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        newScrollPane.getStyleClass().add("walkthroughs-scroll-pane");
+        return newScrollPane;
+    }
+
+    private Button createWalkthroughButton(String text, IconTheme.JabRefIcons icon, String walkthroughId) {
+        Button button = new Button(text);
+        button.setGraphic(icon.getGraphicNode());
+        button.getStyleClass().add("quick-settings-button");
+        button.setMaxWidth(Double.MAX_VALUE);
+        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, walkthroughId).execute());
+        return button;
+    }
+}
diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index 691ab1d2148..bcd1ccffc07 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -1752,6 +1752,7 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-font-size: 1.5em;
     -fx-font-weight: bold;
     -fx-font-family: "Arial";
+    -fx-text-fill: -jr-gray-3;
 }
 
 .welcome-no-recent-label {
@@ -1778,6 +1779,13 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-padding: 2.667em 2em;
 }
 
+.welcome-columns-container,
+.welcome-columns-container:focus,
+.welcome-columns-scroll,
+.welcome-columns-scroll:focus {
+    -fx-background-color: transparent;
+}
+
 .welcome-top-titles {
     -fx-spacing: 0.833em;
     -fx-alignment: left;
@@ -1785,7 +1793,8 @@ We want to have a look that matches our icons in the tool-bar */
 }
 
 .welcome-columns-container {
-    -fx-spacing: 3.333em;
+    -fx-hgap: 2.083em;
+    -fx-vgap: 2.083em;
     -fx-alignment: top-center;
 }
 
@@ -2644,15 +2653,14 @@ journalInfo .grid-cell-b {
 /* Quick Settings */
 .quick-settings-container,
 .walkthroughs-container {
-    -fx-spacing: 0.6667em;
+    -fx-spacing: 0.3333em;
     -fx-alignment: top-left;
 }
 
 .walkthroughs-scroll-pane,
 .quick-settings-scroll-pane {
-    -fx-max-height: 13.333em; /* item-size * 4 + gap * 3 = (0.0833 * 2 + 0.833 * 2 + 1) * 4 + 0.667 * 3 */
-    -fx-min-height: 13.333em;
-    -fx-pref-height: 13.333em;
+    -fx-max-height: 12em;
+    -fx-pref-height: 12em;
 }
 
 .quick-settings-button {
@@ -2717,7 +2725,7 @@ journalInfo .grid-cell-b {
     -fx-border-width: 0.0625em;
     -fx-border-radius: 0.25em;
     -fx-background-radius: 0.25em;
-    -fx-effect: dropshadow(three-pass-box , rgba(0,0,0,0.1) , 0.125em, 0.0 , 0 , 0.0625em );
+    -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.1), 0.125em, 0.0, 0, 0.0625em);
     -fx-border-color: -jr-wf-border-color;
 }
 
@@ -2894,14 +2902,12 @@ journalInfo .grid-cell-b {
     -fx-max-width: infinity;
 }
 
-.walkthrough-tooltip-title,
-.walkthrough-title,
-.walkthrough-tooltip-title .markdown-h2,
-.walkthrough-title .markdown-h2 {
+.walkthrough-tooltip-title > *,
+.walkthrough-title > * {
     -fx-text-fill: -jr-theme;
     -fx-fill: -jr-theme;
     -fx-font-weight: bold;
-    -fx-font-size: 1.75em;
+    -fx-font-size: 2em;
     -fx-line-spacing: -0.25em;
 }
 
@@ -2934,7 +2940,7 @@ journalInfo .grid-cell-b {
 }
 
 .walkthrough-text-content {
-    -fx-text-fill: -jr-gray-3;
+    -fx-text-fill: -fx-text-base-color;
     -fx-font-size: 1.2em;
     -fx-line-spacing: 0.5em;
 }
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
index cab859b9ac9..d3b67bea682 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -74,6 +74,7 @@
     <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
     <CheckBox fx:id="shouldAskForIncludingCrossReferences" text="%Ask whether to include cross-references when copying to another library"/>
     <CheckBox fx:id="confirmHideTabBar" text="%Hide tab bar when single library is present"/>
+    <CheckBox fx:id="donationNeverShow" text="%Do not show donation prompt again"/>
 
     <Label styleClass="sectionHeader" text="%Single instance" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml b/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
deleted file mode 100644
index b40eca9007e..00000000000
--- a/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-
-<fx:root type="VBox" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.welcome.components.QuickSettings"
-         styleClass="welcome-section">
-    <Label styleClass="welcome-header-label" text="%Quick settings"/>
-    <ScrollPane fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="AS_NEEDED"
-                styleClass="quick-settings-scroll-pane">
-        <VBox styleClass="quick-settings-container">
-            <Button fx:id="mainFileDirButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Set main file directory"
-                    onAction="#showMainFileDirectoryDialog">
-                <graphic>
-                    <JabRefIconView glyph="FOLDER"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="themeButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Change visual theme"
-                    onAction="#showThemeDialog">
-                <graphic>
-                    <JabRefIconView glyph="PREFERENCES"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="largeLibraryButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Optimize for large libraries"
-                    onAction="#showLargeLibraryOptimizationDialog">
-                <graphic>
-                    <JabRefIconView glyph="SELECTORS"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="pushApplicationButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Configure push to applications"
-                    onAction="#showPushApplicationConfigurationDialog">
-                <graphic>
-                    <JabRefIconView glyph="APPLICATION_GENERIC"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="onlineServicesButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Configure web search services"
-                    onAction="#showOnlineServicesConfigurationDialog">
-                <graphic>
-                    <JabRefIconView glyph="WWW"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="entryTableButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Customize entry table"
-                    onAction="#showEntryTableConfigurationDialog">
-                <graphic>
-                    <JabRefIconView glyph="TOGGLE_GROUPS"/>
-                </graphic>
-            </Button>
-        </VBox>
-    </ScrollPane>
-</fx:root>
diff --git a/jablib/src/main/resources/SearchExamples.bib b/jablib/src/main/resources/SearchExamples.bib
new file mode 100644
index 00000000000..061e4a2d50c
--- /dev/null
+++ b/jablib/src/main/resources/SearchExamples.bib
@@ -0,0 +1,194 @@
+@Article{LeCun2015,
+  author    = {LeCun, Yann and Bengio, Yoshua and Hinton, Geoffrey},
+  title     = {Deep learning},
+  doi       = {10.1038/nature14539},
+  issn      = {1476-4687},
+  number    = {7553},
+  pages     = {436--444},
+  volume    = {521},
+  journal   = {Nature},
+  month     = may,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2015},
+}
+
+@Misc{Vaswani2017,
+  author    = {Vaswani, Ashish and Shazeer, Noam and Parmar, Niki and Uszkoreit, Jakob and Jones, Llion and Gomez, Aidan N. and Kaiser, Lukasz and Polosukhin, Illia},
+  title     = {Attention is all you need},
+  doi       = {10.48550/ARXIV.1706.03762},
+  copyright = {arXiv.org perpetual, non-exclusive license},
+  keywords  = {Computation and Language (cs.CL), Machine Learning (cs.LG), FOS: Computer and information sciences, FOS: Computer and information sciences},
+  publisher = {arXiv},
+  year      = {2017},
+}
+
+@Article{Silver2016,
+  author    = {Silver, David and Huang, Aja and Maddison, Chris J. and Guez, Arthur and Sifre, Laurent and van den Driessche, George and Schrittwieser, Julian and Antonoglou, Ioannis and Panneershelvam, Veda and Lanctot, Marc and Dieleman, Sander and Grewe, Dominik and Nham, John and Kalchbrenner, Nal and Sutskever, Ilya and Lillicrap, Timothy and Leach, Madeleine and Kavukcuoglu, Koray and Graepel, Thore and Hassabis, Demis},
+  title     = {Mastering the game of {Go} with deep neural networks and tree search},
+  doi       = {10.1038/nature16961},
+  issn      = {1476-4687},
+  number    = {7587},
+  pages     = {484--489},
+  volume    = {529},
+  journal   = {Nature},
+  month     = jan,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2016},
+}
+
+@Article{Esteva2017,
+  author    = {Esteva, Andre and Kuprel, Brett and Novoa, Roberto A. and Ko, Justin and Swetter, Susan M. and Blau, Helen M. and Thrun, Sebastian},
+  title     = {Dermatologist-level classification of skin cancer with deep neural networks},
+  doi       = {10.1038/nature21056},
+  issn      = {1476-4687},
+  number    = {7639},
+  pages     = {115--118},
+  volume    = {542},
+  journal   = {Nature},
+  month     = jan,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2017},
+}
+
+@Article{Tian2025,
+  author    = {Tian, Yingjie and Wen, Haonan and Guo, Kun},
+  title     = {Machine learning applications in climate finance: An overview},
+  doi       = {10.1016/j.ribaf.2025.103063},
+  issn      = {0275-5319},
+  pages     = {103063},
+  journal   = {Research in International Business and Finance},
+  month     = aug,
+  publisher = {Elsevier BV},
+  year      = {2025},
+}
+
+@Article{Supriyono2024,
+  author    = {Supriyono and Wibawa, Aji Prasetya and Suyono and Kurniawan, Fachrul},
+  title     = {Advancements in natural language processing: Implications, challenges, and future directions},
+  doi       = {10.1016/j.teler.2024.100173},
+  issn      = {2772-5030},
+  pages     = {100173},
+  volume    = {16},
+  journal   = {Telematics and Informatics Reports},
+  month     = dec,
+  publisher = {Elsevier BV},
+  year      = {2024},
+}
+
+@Article{Kumar2025,
+  author    = {Kumar, Narendra and Kumar, Krishna and Aeron, Anurag and Verre, Filippo},
+  title     = {Blockchain technology in supply chain management: Innovations, applications, and challenges},
+  doi       = {10.1016/j.teler.2025.100204},
+  issn      = {2772-5030},
+  pages     = {100204},
+  volume    = {18},
+  journal   = {Telematics and Informatics Reports},
+  month     = jun,
+  publisher = {Elsevier BV},
+  year      = {2025},
+}
+
+@Article{Watson1953,
+  author    = {Watson, J. D. and Crick, F. H. C.},
+  title     = {Molecular structure of nucleic acids: a structure for deoxyribose nucleic acid},
+  doi       = {10.1038/171737a0},
+  issn      = {1476-4687},
+  number    = {4356},
+  pages     = {737--738},
+  volume    = {171},
+  abstract  = {WE wish to suggest a structure for the salt of deoxyribose nucleic acid (DNA). This structure has novel features which are of considerable biological interest.
+
+A structure for nucleic acid has already been proposed by Pauling and Corey1. They kindly made their manuscript available to us in advance of publication. Their model consists of three intertwined chains, with the phosphates near the fibre axis, and the bases on the outside. In our opinion, this structure is unsatisfactory for two reasons : (1) We believe that the material which gives the X-ray diagrams is the salt, not the free acid. Without the acidic hydrogen atoms it is not clear what forces would hold the structure together, especially as the negatively charged phosphates near the axis will repel each other. (2) Some of the van der Waals distances appear to be too small.},
+  journal   = {Nature},
+  month     = apr,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {1953},
+}
+
+@Article{Matson2024,
+  author    = {Matson, Robert P. and Comba, Isin Y. and Silvert, Eli and Niesen, Michiel J. M. and Murugadoss, Karthik and Patwardhan, Dhruti and Suratekar, Rohit and Goel, Elizabeth-Grace and Poelaert, Brittany J. and Wan, Kanny K. and Brimacombe, Kyle R. and Venkatakrishnan, AJ and Soundararajan, Venky},
+  title     = {A deep learning approach predicting the activity of {COVID-19} therapeutics and vaccines against emerging variants},
+  doi       = {10.1038/s41540-024-00471-0},
+  issn      = {2056-7189},
+  number    = {1},
+  volume    = {10},
+  journal   = {npj Systems Biology and Applications},
+  month     = nov,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2024},
+}
+
+@Article{Kumar2024,
+  author    = {Kumar, Neelam Sanjeev and Deepika, G. and Goutham, V. and Buvaneswari, B. and Reddy, R. Vijaya Kumar and Angadi, Sanjeevkumar and Dhanamjayulu, C. and Chinthaginjala, Ravikumar and Mohammad, Faruq and Khan, Baseem},
+  title     = {{HARNet} in deep learning approach---a systematic survey},
+  doi       = {10.1038/s41598-024-58074-y},
+  issn      = {2045-2322},
+  number    = {1},
+  volume    = {14},
+  journal   = {Scientific Reports},
+  month     = apr,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2024},
+}
+
+@Book{WHO2023,
+  author      = {{World Health Organization}},
+  date        = {2023},
+  title       = {World health statistics 2023: monitoring health for the {SDGs}, sustainable development goals},
+  edition     = {First},
+  isbn        = {9789240074323},
+  note        = {Description based on publisher supplied metadata and other sources.},
+  pagetotal   = {1136},
+  subtitle    = {Monitoring Health for the SDGs, Sustainable Development Goals},
+  address     = {Geneva},
+  ppn_gvk     = {1907990577},
+  shortauthor = {WHO},
+}
+
+@Article{Morgan1923,
+  author       = {T. H. Morgan},
+  date         = {1923},
+  journaltitle = {The Scientific Monthly},
+  title        = {The Bearing of Mendelism on the Origin of Species},
+  issn         = {00963771},
+  number       = {3},
+  pages        = {237--247},
+  url          = {http://www.jstor.org/stable/6477},
+  urldate      = {2025-08-10},
+  volume       = {16},
+  publisher    = {American Association for the Advancement of Science},
+}
+
+@Misc{Kirillov2023,
+  author      = {Alexander Kirillov and Eric Mintun and Nikhila Ravi and Hanzi Mao and Chloe Rolland and Laura Gustafson and Tete Xiao and Spencer Whitehead and Alexander C. Berg and Wan-Yen Lo and Piotr Dollár and Ross Girshick},
+  date        = {2023},
+  title       = {Segment Anything},
+  eprint      = {2304.02643},
+  eprintclass = {cs.CV},
+  eprinttype  = {arXiv},
+  url         = {https://arxiv.org/abs/2304.02643},
+}
+
+@Article{Khalifa2021,
+  author       = {Khalifa, Shaden A. M. and Swilam, Mahmoud M. and El-Wahed, Aida A. Abd and Du, Ming and El-Seedi, Haged H. R. and Kai, Guoyin and Masry, Saad H. D. and Abdel-Daim, Mohamed M. and Zou, Xiaobo and Halabi, Mohammed F. and Alsharif, Sultan M. and El-Seedi, Hesham R.},
+  date         = {2021-05},
+  journaltitle = {International Journal of Environmental Research and Public Health},
+  title        = {Beyond the pandemic: {COVID-19} pandemic changed the face of life},
+  doi          = {10.3390/ijerph18115645},
+  issn         = {1660-4601},
+  number       = {11},
+  pages        = {5645},
+  volume       = {18},
+  publisher    = {MDPI AG},
+}
+
+@InBook{Chapman1992,
+  author    = {Chapman, Malcolm},
+  booktitle = {The Celts},
+  date      = {1992},
+  title     = {Who are the celts?},
+  doi       = {10.1057/9780230378650_1},
+  isbn      = {9780230378650},
+  pages     = {1--13},
+  publisher = {Palgrave Macmillan UK},
+}
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 7d62723b88d..e1973dde378 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -3144,6 +3144,80 @@ Groups\ walkthrough\ completed=Groups walkthrough completed
 You've\ learned\ how\ to\ create\ groups\ and\ add\ entries\ to\ them.\ Groups\ are\ a\ powerful\ way\ to\ organize\ your\ bibliography\ and\ can\ be\ nested\ to\ create\ hierarchical\ structures.=You've learned how to create groups and add entries to them. Groups are a powerful way to organize your bibliography and can be nested to create hierarchical structures.
 For\ more\ information\ about\ groups\:\ [Groups\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)=For more information about groups: [Groups documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)
 
+# Walkthrough: Search
+Search\ your\ library=Search your library
+Prepare\ search\ settings=Prepare\ search\ settings
+
+# Step 2
+Welcome\ to\ the\ search\ walkthrough=Welcome\ to\ the\ search\ walkthrough
+This\ walkthrough\ will\ guide\ you\ through\ JabRef's\ search\ capabilities.\ We've\ loaded\ a\ sample\ library\ to\ demonstrate\ various\ search\ techniques.=This\ walkthrough\ will\ guide\ you\ through\ JabRef's\ search\ capabilities.\ We've\ loaded\ a\ sample\ library\ to\ demonstrate\ various\ search\ techniques.
+
+# Step 3
+Click\ in\ the\ search\ field\ to\ begin=Click\ in\ the\ search\ field\ to\ begin
+You\ can\ also\ use\ `Ctrl+F`\ or\ `Cmd+F`\ to\ focus\ the\ search\ field.=You\ can\ also\ use\ `Ctrl+F`\ or\ `Cmd+F`\ to\ focus\ the\ search\ field.
+
+# Step 4
+Type\ `machine\ learning`=Type\ `machine\ learning`
+As\ you\ type,\ JabRef\ instantly\ dims\ all\ non-matching\ entries.\ By\ default,\ searches\ are\ case-insensitive\ and\ look\ through\ all\ fields\ like\ title,\ author,\ abstract,\ and\ keywords.=As\ you\ type,\ JabRef\ instantly\ dims\ all\ non-matching\ entries.\ By\ default,\ searches\ are\ case-insensitive\ and\ look\ through\ all\ fields\ like\ title,\ author,\ abstract,\ and\ keywords.
+
+# Step 5
+Understanding\ search\ results=Understanding\ search\ results
+Notice\ how\ entries\ not\ containing\ "machine\ learning"\ are\ dimmed.=Notice\ how\ entries\ not\ containing\ "machine\ learning"\ are\ dimmed.
+This\ found\ entries\ with\ at\ least\ a\ field\ in\ their\ metadata\ (\*e.g.,\*\ title,\ author,\ abstract,\ \*etc.\*\)\ containing\ "machine\ learning".=This\ found\ entries\ with\ at\ least\ a\ field\ in\ their\ metadata\ (\*e.g.,\*\ title,\ author,\ abstract,\ \*etc.\*\)\ containing\ "machine\ learning".
+
+# Step 6
+Toggle\ filter\ mode\ to\ hide\ non-matching\ entries=Toggle\ filter\ mode\ to\ hide\ non-matching\ entries
+Filter\ mode\ shows\ only\ matching\ entries,\ hiding\ everything\ else.=Filter\ mode\ shows\ only\ matching\ entries,\ hiding\ everything\ else.
+
+# Step 7
+Clear\ the\ search\ to\ see\ all\ entries\ again=Clear\ the\ search\ to\ see\ all\ entries\ again
+
+# Step 8
+Type\ `author\ \=\ Son`=Type\ `author\ \=\ Son`
+The\ equals\ sign\ (`\=`)\ means\ "contains"\ and\ is\ case-insensitive\ by\ default.=The\ equals\ sign\ (`\=`)\ means\ "contains"\ and\ is\ case-insensitive\ by\ default.
+This\ query\ finds\ all\ papers\ where\ any\ author's\ name\ contains\ "Son,"\ including\ "Maddison,"\ "Watson,\ J.,"\ or\ "Matson,\ Robert\ P.".\ It\ won't\ match\ "Son"\ appearing\ in\ titles\ or\ abstracts.=This\ query\ finds\ all\ papers\ where\ any\ author's\ name\ contains\ "Son,"\ including\ "Maddison,"\ "Watson,\ J.,"\ or\ "Matson,\ Robert\ P.".\ It\ won't\ match\ "Son"\ appearing\ in\ titles\ or\ abstracts.
+
+# Step 9
+Type\ `date\ \=\=\ 2023`=Type\ `date\ \=\=\ 2023`
+The\ double\ equals\ (`\=\=`)\ means\ exact\ match,\ not\ just\ contains.\ This\ query\ finds\ only\ papers\ with\ field\ "date"\ exactly\ in\ 2023.=The\ double\ equals\ (`\=\=`)\ means\ exact\ match,\ not\ just\ contains.\ This\ query\ finds\ only\ papers\ with\ field\ "date"\ exactly\ in\ 2023.
+With\ single\ equals\ (\*e.g.,\*\ `date\ \=\ 23`),\ you'd\ also\ match\ dates\ like\ 1923\ or\ 2230.=With\ single\ equals\ (\*e.g.,\*\ `date\ \=\ 23`),\ you'd\ also\ match\ dates\ like\ 1923\ or\ 2230.
+
+# Step 10
+Type\ `shortauthor\ \=\ WHO\ AND\ date\ \=\=\ 2023`=Type\ `shortauthor\ \=\ WHO\ AND\ date\ \=\=\ 2023`
+This\ query\ finds\ papers\ by\ WHO\ from\ 2023.\ `AND`\ requires\ both\ conditions\ to\ be\ true.=This\ query\ finds\ papers\ by\ WHO\ from\ 2023.\ `AND`\ requires\ both\ conditions\ to\ be\ true.
+
+# Step 11
+Type\ `title\ \=\ covid\ OR\ title\ \=\ pandemic`=Type `title = covid OR title = pandemic`
+This\ query\ finds\ paper\ with\ title\ containing\ either\ COVID\ or\ pandemics\ in\ general.=This query finds paper with title containing either COVID or pandemics in general.
+`OR`\ can\ be\ satisified\ with\ either\ of\ the\ conditions\ being\ true.=`OR`\ can\ be\ satisified\ with\ either\ of\ the\ conditions\ being\ true.
+
+# Step 12
+Type\ `deep\ learning\ NOT\ title\ \=\ survey`=Type\ `deep\ learning\ NOT\ title\ \=\ survey`
+This\ query\ finds\ entries\ with\ "deep\ learning"\ in\ its\ metadata,\ but\ not\ "survey"\ in\ the\ title.=This\ query\ finds\ entries\ with\ "deep\ learning"\ in\ its\ metadata,\ but\ not\ "survey"\ in\ the\ title.
+NOT\ helps\ you\ filter\ out\ unwanted\ results.=NOT\ helps\ you\ filter\ out\ unwanted\ results.
+
+# Step 13
+Enable\ regular\ expressions\ for\ pattern\ matching=Enable\ regular\ expressions\ for\ pattern\ matching
+Regular\ expressions\ allow\ sophisticated\ pattern\ matching.\ Click\ this\ button\ to\ enable\ regex\ mode\ for\ advanced\ searches.=Regular\ expressions\ allow\ sophisticated\ pattern\ matching.\ Click\ this\ button\ to\ enable\ regex\ mode\ for\ advanced\ searches.
+
+# Step 14
+The\ `\=~`\ operator\ explicitly\ uses\ regex.\ The\ pipe\ operator\ `|`\ allows\ `(deep|machine)`\ matches\ either\ word\ (deep\ or\ machine).\ This\ finds\ "deep\ learning"\ and\ "machine\ learning"\ but\ not\ "learning"\ alone.=The `=~` operator explicitly uses regex. The pipe operator `|` allows `(deep|machine)` matches either word (deep or machine). This finds "deep learning" and "machine learning" but not "learning" alone.
+Type\ `title\ \=~\ \\(deep|machine\\)\ learning`=Type `title =~ \\(deep|machine\\) learning`
+Click\ on\ the\ regex\ button\ on\ previous\ step\ enables\ regex\ mode,\ allowing\ you\ to\ type\ `\\(deep|machine\\)\ learning`\ directly\ to\ search\ for\ any\ entry\ with\ metadata\ matching\ the\ regex.\ If\ you\ use\ `\=~`,\ regardless\ of\ whether\ regex\ mode\ is\ enabled,\ it\ will\ always\ treat\ the\ search\ as\ a\ regex.=Click on the regex button on previous step enables regex mode, allowing you to type `\\(deep|machine\\) learning` directly to search for any entry with metadata matching the regex. If you use `=~`, regardless of whether regex mode is enabled, it will always treat the search as a regex.
+
+# Step 15
+Enable\ case-sensitive\ searching=Enable\ case-sensitive\ searching
+This\ is\ useful\ when\ case\ matters,\ like\ distinguishing\ \"WHO\"\ (World\ Health\ Organization)\ from\ \"who\".=This\ is\ useful\ when\ case\ matters,\ like\ distinguishing\ \"WHO\"\ (World\ Health\ Organization)\ from\ \"who\".
+
+# Step 16
+Type\ `WHO`=Type\ `WHO`
+This\ query\ finds\ entries\ with\ capital\ WHO\ only.\ With\ case\ sensitivity\ on,\ this\ won't\ match\ \"who\"\ or\ \"Who\".=This\ query\ finds\ entries\ with\ capital\ WHO\ only.\ With\ case\ sensitivity\ on,\ this\ won't\ match\ \"who\"\ or\ \"Who\".
+
+# Step 17
+Search\ walkthrough\ completed=Search\ walkthrough\ completed
+**Quick\ reference\:**\n-\ Press\ **Ctrl+F**\ to\ jump\ to\ search\n-\ Use\ **field\ \=\ value**\ for\ field\ searches\n-\ Combine\ with\ **AND**,\ **OR**,\ **NOT**\n-\ Enable\ **regex**\ for\ pattern\ matching=**Quick reference:**\n- Press **Ctrl+F** to jump to search\n- Use **field = value** for field searches\n- Combine with **AND**, **OR**, **NOT**\n- Enable **regex** for pattern matching
+For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/search)=For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/search)
+
 # Walkthrough side effects
 Side\ effect\ timeout=Side effect timeout
 The\ condition\ for\ '%0'\ was\ not\ met\ within\ the\ timeout\ period.=The condition for '%0' was not met within the timeout period.

From 54b5a0386ff9d00ba6da448825330b25bd1c92f8 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:20:05 -0400
Subject: [PATCH 06/22] Additional fix to responsive layout

---
 jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index a9fb1d0d967..8d547549eb3 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -159,6 +159,7 @@ private ScrollPane createColumnsContainerScrollable() {
         scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
         scrollPane.getStyleClass().add("welcome-columns-scroll");
+        scrollPane.setStyle("-fx-background-color: transparent;"); // Using class selector is insufficient to prevent background from turning white on click.
         return scrollPane;
     }
 

From 25eb89f2cef4a2005ac9cbfa26c248e09af669bc Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:26:30 -0400
Subject: [PATCH 07/22] Fix walkthrough color

---
 jabgui/src/main/resources/org/jabref/gui/Base.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index bcd1ccffc07..9df952ea22b 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -2904,10 +2904,10 @@ journalInfo .grid-cell-b {
 
 .walkthrough-tooltip-title > *,
 .walkthrough-title > * {
-    -fx-text-fill: -jr-theme;
-    -fx-fill: -jr-theme;
+    -fx-text-fill: -jr-theme!important;
+    -fx-fill: -jr-theme!important;
     -fx-font-weight: bold;
-    -fx-font-size: 2em;
+    -fx-font-size: 1.75em;
     -fx-line-spacing: -0.25em;
 }
 

From 7aa6c286156885f034801f321665ac610899a7cd Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:28:45 -0400
Subject: [PATCH 08/22] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a89d5a937e3..bb02c480695 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We changed the validation error dialog for overriding the default file directories to a confirmation dialog for saving other preferences under the library properties. [#13488](https://github.com/JabRef/jabref/pull/13488)
 - We improved file exists warning dialog with clearer options and tooltips [#12565](https://github.com/JabRef/jabref/issues/12565)
 - We introduced walkthrough functionality [#12664](https://github.com/JabRef/jabref/issues/12664)
+- We introduced responsive layout in WelcomeTab [#12664](https://github.com/JabRef/jabref/issues/12664)
+- We introduced donation prompt in WelcomeTab [#12664](https://github.com/JabRef/jabref/issues/12664)
 
 ### Fixed
 

From 4e8633a166018e0a64c73be25d405b2aaf6d5cc4 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:31:54 -0400
Subject: [PATCH 09/22] Small tweaaks to Walkthroughs

---
 .../java/org/jabref/gui/walkthrough/WalkthroughAction.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index 4948057fec1..18fef13b42d 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -354,6 +354,7 @@ private Walkthrough createGroupWalkthrough() {
                         .resolver(NodeResolver.fxId("descriptionField"))
                         .trigger(Trigger.onTextInput())
                         .position(TooltipPosition.RIGHT)
+                        .continueButton(Localization.lang("Continue"))
                         .activeWindow(WindowResolver.title(Localization.lang("Add group")))
                         .showQuitButton(false)
                         .highlight(groupHighlight))
@@ -559,7 +560,7 @@ private Walkthrough createSearchWalkthrough() {
                         .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.REG_EX))
                         .trigger(Trigger.onClick())
                         .position(TooltipPosition.BOTTOM)
-                        .highlight(HighlightEffect.PING))
+                        .highlight(HighlightEffect.SPOT_LIGHT))
                 // Step 14: Using regex patterns
                 .addStep(WalkthroughStep
                         .tooltip(Localization.lang("Type `title =~ \\(deep|machine\\) learning`"))

From 8396fd08e5f273744f1583865506db61c7bc9ac0 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:08:06 -0400
Subject: [PATCH 10/22] Add search walkthrough and responsive layout for
 WelcomeTab

---
 .../org/jabref/gui/frame/JabRefFrame.java     |   8 +-
 .../gui/preferences/GuiPreferences.java       |   3 +
 .../jabref/gui/search/GlobalSearchBar.java    |  30 +--
 .../gui/walkthrough/WalkthroughAction.java    | 166 ++++++++++++++-
 .../walkthrough/declarative/NodeResolver.java |  26 ++-
 .../org/jabref/gui/welcome/WelcomeTab.java    | 185 +++++++++--------
 .../gui/welcome/components/QuickSettings.java | 118 +++++++++--
 .../gui/welcome/components/Walkthroughs.java  | 104 ++++++++++
 .../main/resources/org/jabref/gui/Base.css    |  30 +--
 .../gui/preferences/general/GeneralTab.fxml   |   1 +
 .../gui/welcome/components/QuickSettings.fxml |  65 ------
 jablib/src/main/resources/SearchExamples.bib  | 194 ++++++++++++++++++
 .../main/resources/l10n/JabRef_en.properties  |  74 +++++++
 13 files changed, 793 insertions(+), 211 deletions(-)
 create mode 100644 jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
 delete mode 100644 jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
 create mode 100644 jablib/src/main/resources/SearchExamples.bib

diff --git a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
index 815b92e8268..dfae60afdaf 100644
--- a/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
+++ b/jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
@@ -48,6 +48,7 @@
 import org.jabref.gui.search.SearchType;
 import org.jabref.gui.sidepane.SidePane;
 import org.jabref.gui.sidepane.SidePaneType;
+import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.RedoAction;
 import org.jabref.gui.undo.UndoAction;
@@ -447,7 +448,8 @@ private void initBindings() {
     }
 
     private void updateTabBarVisible() {
-        if (preferences.getWorkspacePreferences().shouldHideTabBar() && stateManager.getOpenDatabases().size() <= 1) {
+        // When WelcomeTab is open, the tabbar should be visible
+        if (preferences.getWorkspacePreferences().shouldHideTabBar() && tabbedPane.getTabs().size() <= 1) {
             if (!tabbedPane.getStyleClass().contains("hide-tab-bar")) {
                 tabbedPane.getStyleClass().add("hide-tab-bar");
             }
@@ -507,7 +509,9 @@ public void showWelcomeTab() {
                 clipBoardManager,
                 taskExecutor,
                 fileHistory,
-                Injector.instantiateModelOrService(BuildInfo.class)
+                Injector.instantiateModelOrService(BuildInfo.class),
+                preferences.getWorkspacePreferences(),
+                Injector.instantiateModelOrService(ThemeManager.class)
         );
         tabbedPane.getTabs().add(welcomeTab);
         tabbedPane.getSelectionModel().select(welcomeTab);
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
index 6e1faaded08..0b7e2acdf9e 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
@@ -19,6 +19,7 @@
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.push.PushToApplicationPreferences;
+import org.jabref.gui.preferences.DonationPreferences;
 
 public interface GuiPreferences extends CliPreferences {
     CopyToPreferences getCopyToPreferences();
@@ -58,4 +59,6 @@ public interface GuiPreferences extends CliPreferences {
     KeyBindingRepository getKeyBindingRepository();
 
     NewEntryPreferences getNewEntryPreferences();
+
+    DonationPreferences getDonationPreferences();
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index b9e69dd464f..95471f3b520 100644
--- a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -275,24 +275,32 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        regexButton.selectedProperty().bind(Bindings.createBooleanBinding(
-                () -> searchPreferences.getObservableSearchFlags().contains(SearchFlags.REGULAR_EXPRESSION),
-                searchPreferences.getObservableSearchFlags()
-        ));
+        regexButton.setSelected(searchPreferences.isRegularExpression());
         regexButton.setTooltip(new Tooltip(Localization.lang("Regular expression") + "\n" + Localization.lang("This only affects unfielded terms. For using RegEx in a fielded term, use =~ operator.")));
         initSearchModifierButton(regexButton);
+        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchFlags>) change -> {
+            if (change.wasAdded() && change.getElementAdded() == SearchFlags.REGULAR_EXPRESSION) {
+                regexButton.setSelected(true);
+            } else if (change.wasRemoved() && change.getElementRemoved() == SearchFlags.REGULAR_EXPRESSION) {
+                regexButton.setSelected(false);
+            }
+        });
         regexButton.setOnAction(_ -> {
             searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, regexButton.isSelected());
             searchField.requestFocus();
             updateSearchQuery();
         });
 
-        caseSensitiveButton.selectedProperty().bind(Bindings.createBooleanBinding(
-                () -> searchPreferences.getObservableSearchFlags().contains(SearchFlags.CASE_SENSITIVE),
-                searchPreferences.getObservableSearchFlags()
-        ));
+        caseSensitiveButton.setSelected(searchPreferences.isCaseSensitive());
         caseSensitiveButton.setTooltip(new Tooltip(Localization.lang("Case sensitive") + "\n" + Localization.lang("This only affects unfielded terms. For using case-sensitive in a fielded term, use =! operator.")));
         initSearchModifierButton(caseSensitiveButton);
+        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchFlags>) change -> {
+            if (change.wasAdded() && change.getElementAdded() == SearchFlags.CASE_SENSITIVE) {
+                caseSensitiveButton.setSelected(true);
+            } else if (change.wasRemoved() && change.getElementRemoved() == SearchFlags.CASE_SENSITIVE) {
+                caseSensitiveButton.setSelected(false);
+            }
+        });
         caseSensitiveButton.setOnAction(_ -> {
             searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, caseSensitiveButton.isSelected());
             searchField.requestFocus();
@@ -304,12 +312,10 @@ private void initSearchModifierButtons() {
         initSearchModifierButton(keepSearchString);
         keepSearchString.selectedProperty().addListener((_, _, _) -> searchField.requestFocus());
 
-        filterModeButton.selectedProperty().bind(Bindings.createBooleanBinding(
-                () -> searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER,
-                searchPreferences.searchDisplayModeProperty()
-        ));
+        filterModeButton.setSelected(searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER);
         filterModeButton.setTooltip(new Tooltip(Localization.lang("Filter search results")));
         initSearchModifierButton(filterModeButton);
+        searchPreferences.searchDisplayModeProperty().addListener((_, _, newVal) -> filterModeButton.setSelected(newVal == SearchDisplayMode.FILTER));
         filterModeButton.setOnAction(_ -> {
             searchPreferences.setSearchDisplayMode(filterModeButton.isSelected() ? SearchDisplayMode.FILTER : SearchDisplayMode.FLOAT);
             searchField.requestFocus();
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index beaeb480972..4948057fec1 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -16,6 +16,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.preferences.PreferencesDialogView;
+import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.walkthrough.declarative.NodeResolver;
 import org.jabref.gui.walkthrough.declarative.Trigger;
 import org.jabref.gui.walkthrough.declarative.WindowResolver;
@@ -24,6 +25,7 @@
 import org.jabref.gui.walkthrough.declarative.effect.WindowEffect;
 import org.jabref.gui.walkthrough.declarative.richtext.InfoBlock;
 import org.jabref.gui.walkthrough.declarative.richtext.TextBlock;
+import org.jabref.gui.walkthrough.declarative.sideeffect.EnsureSearchSettingsSideEffect;
 import org.jabref.gui.walkthrough.declarative.sideeffect.OpenLibrarySideEffect;
 import org.jabref.gui.walkthrough.declarative.step.PanelPosition;
 import org.jabref.gui.walkthrough.declarative.step.QuitButtonPosition;
@@ -31,11 +33,14 @@
 import org.jabref.gui.walkthrough.declarative.step.WalkthroughStep;
 import org.jabref.logic.l10n.Localization;
 
+import org.controlsfx.control.textfield.CustomTextField;
+
 public class WalkthroughAction extends SimpleCommand {
     public static final String PDF_LINK_WALKTHROUGH_NAME = "pdfLink";
     public static final String MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME = "mainFileDirectory";
     public static final String CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME = "customizeEntryTable";
     public static final String GROUP_WALKTHROUGH_NAME = "group";
+    public static final String SEARCH_WALKTHROUGH_NAME = "search";
 
     private static final Map<String, Walkthrough> WALKTHROUGH_CACHE = new ConcurrentHashMap<>();
 
@@ -65,6 +70,7 @@ private Walkthrough getWalkthrough(String name) {
                     case CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME ->
                             createCustomizeEntryTableWalkthrough();
                     case GROUP_WALKTHROUGH_NAME -> createGroupWalkthrough();
+                    case SEARCH_WALKTHROUGH_NAME -> createSearchWalkthrough();
                     default ->
                             throw new IllegalArgumentException("Unknown walkthrough: " + name);
                 }
@@ -312,11 +318,11 @@ private Walkthrough createGroupWalkthrough() {
                 .create(stateManager)
                 // Step 1: Open example library
                 .addStep(WalkthroughStep.sideEffect(Localization.lang("Open Example Library"))
-                        .sideEffect(new OpenLibrarySideEffect(frame)))
+                                        .sideEffect(new OpenLibrarySideEffect(frame)))
                 // Step 2: Highlight groups sidepane
                 .addStep(WalkthroughStep
                         .panel(Localization.lang("Welcome to groups walkthrough"))
-                    .content(
+                        .content(
                                 new TextBlock(Localization.lang("This walkthrough will guide you through creating and managing groups in JabRef. Groups help you organize your bibliography entries into collections. We've opened an example library so you can practice with real entries.")),
                                 new InfoBlock(Localization.lang("The groups panel on the left side shows all your groups in a tree structure. You can create groups, add entries to them, and organize them hierarchically."))
                         )
@@ -433,6 +439,162 @@ private Walkthrough createGroupWalkthrough() {
                 .build();
     }
 
+    private Walkthrough createSearchWalkthrough() {
+        NodeResolver searchFieldResolver = scene -> NodeResolver
+                .predicate(GlobalSearchBar.class::isInstance)
+                .resolve(scene)
+                .flatMap(node -> node instanceof GlobalSearchBar bar ?
+                        bar.getChildren().stream().filter(CustomTextField.class::isInstance).findAny() :
+                        Optional.empty());
+
+        return Walkthrough
+                .create(stateManager)
+                // Step 1: Open example library
+                .addStep(WalkthroughStep.sideEffect(Localization.lang("Open Example Library"))
+                                        .sideEffect(new OpenLibrarySideEffect(frame, "SearchExamples.bib")))
+                // Step 1b: Ensure initial search settings
+                .addStep(WalkthroughStep.sideEffect(Localization.lang("Prepare search settings"))
+                                        .sideEffect(new EnsureSearchSettingsSideEffect()))
+                // Step 2: Introduction
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Welcome to the search walkthrough"))
+                        .content(
+                                new TextBlock(Localization.lang("This walkthrough will guide you through JabRef's search capabilities. We've loaded a sample library to demonstrate various search techniques."))
+                        )
+                        .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("MainTable")))
+                        .continueButton(Localization.lang("Continue"))
+                        .position(PanelPosition.BOTTOM)
+                        .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 3: Focus on GlobalSearchBar
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Click in the search field to begin"))
+                        .content(new InfoBlock(Localization.lang("You can also use `Ctrl+F` or `Cmd+F` to focus the search field.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                // Step 4-7: Simple text search
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `machine learning`"))
+                        .content(new TextBlock(Localization.lang("As you type, JabRef instantly dims all non-matching entries. By default, searches are case-insensitive and look through all fields like title, author, abstract, and keywords.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextEquals("machine learning"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Understanding search results"))
+                        .content(
+                                new TextBlock(Localization.lang("Notice how entries not containing \"machine learning\" are dimmed.")),
+                                new InfoBlock(Localization.lang("This found entries with at least a field in their metadata (*e.g.,* title, author, abstract, *etc.*) containing \"machine learning\"."))
+                        )
+                        .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("MainTable")))
+                        .continueButton(Localization.lang("Continue"))
+                        .position(PanelPosition.RIGHT)
+                        .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT)
+                        .highlight(HighlightEffect.NONE))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Toggle filter mode to hide non-matching entries"))
+                        .content(new TextBlock(Localization.lang("Filter mode shows only matching entries, hiding everything else.")))
+                        .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.FILTER))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Clear the search to see all entries again"))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextEquals(""))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 8: Field-specific search
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `author = Son`"))
+                        .content(
+                                new TextBlock(Localization.lang("The equals sign (`=`) means \"contains\" and is case-insensitive by default.")),
+                                new InfoBlock(Localization.lang("This query finds all papers where any author's name contains \"Son,\" including \"Maddison,\" \"Watson, J.,\" or \"Matson, Robert P.\". It won't match \"Son\" appearing in titles or abstracts."))
+                        )
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)\\s*author\\s*=\\s*son\\s*"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 9: Exact field matching
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `date == 2023`"))
+                        .content(new TextBlock(Localization.lang("The double equals (`==`) means exact match, not just contains. This query finds only papers with field \"date\" exactly in 2023.")),
+                                new InfoBlock(Localization.lang("With single equals (*e.g.,* `date = 23`), you'd also match dates like 1923 or 2230.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)\\s*date\\s*==\\s*2023\\s*"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 10: Combining search terms with AND
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `shortauthor = WHO AND date == 2023`"))
+                        .content(new TextBlock(Localization.lang("This query finds papers by WHO from 2023. `AND` requires both conditions to be true.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)shortauthor\\s*=\\s*WHO\\s+AND\\s+date\\s*==\\s*2023|date\\s*==\\s*2023\\s+AND\\s+shortauthor\\s*=\\s*WHO"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 11: Using OR for alternatives
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `title = covid OR title = pandemic`"))
+                        .content(new TextBlock(Localization.lang("This query finds paper with title containing either COVID or pandemics in general.")),
+                                new InfoBlock(Localization.lang("`OR` can be satisified with either of the conditions being true.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)title\\s*=\\s*covid\\s+OR\\s+title\\s*=\\s*pandemic|title\\s*=\\s*pandemic\\s+OR\\s+title\\s*=\\s*covid"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 12: Negation with NOT
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `deep learning NOT title = survey`"))
+                        .content(new TextBlock(Localization.lang("This query finds entries with \"deep learning\" in its metadata, but not \"survey\" in the title.")),
+                                new InfoBlock(Localization.lang("NOT helps you filter out unwanted results.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)deep\\s+learning\\s+NOT\\s+title\\s*=\\s*survey"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 13: Regex
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Enable regular expressions for pattern matching"))
+                        .content(new TextBlock(Localization.lang("Regular expressions allow sophisticated pattern matching. Click this button to enable regex mode for advanced searches.")))
+                        .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.REG_EX))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 14: Using regex patterns
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `title =~ \\(deep|machine\\) learning`"))
+                        .content(new TextBlock(Localization.lang("The `=~` operator explicitly uses regex. The pipe operator `|` allows `(deep|machine)` matches either word (deep or machine). This finds \"deep learning\" and \"machine learning\" but not \"learning\" alone.")),
+                                new InfoBlock(Localization.lang("Click on the regex button on previous step enables regex mode, allowing you to type `\\(deep|machine\\) learning` directly to search for any entry with metadata matching the regex. If you use `=~`, regardless of whether regex mode is enabled, it will always treat the search as a regex.")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextMatchesRegex("(?i)title\\s*=~\\s*\\\\\\(deep\\|machine\\\\\\)\\s*learning"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 15-16: Case sensitivity
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Enable case-sensitive searching"))
+                        .content(new TextBlock(Localization.lang("This is useful when case matters, like distinguishing \"WHO\" (World Health Organization) from \"who\".")))
+                        .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.CASE_SENSITIVE))
+                        .trigger(Trigger.onClick())
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.SPOT_LIGHT))
+                .addStep(WalkthroughStep
+                        .tooltip(Localization.lang("Type `WHO`"))
+                        .content(new TextBlock(Localization.lang("This query finds entries with capital WHO only. With case sensitivity on, this won't match \"who\" or \"Who\".")))
+                        .resolver(searchFieldResolver)
+                        .trigger(Trigger.onTextEquals("WHO"))
+                        .position(TooltipPosition.BOTTOM)
+                        .highlight(HighlightEffect.PING))
+                // Step 17: Completion
+                .addStep(WalkthroughStep
+                        .panel(Localization.lang("Search walkthrough completed"))
+                        .content(new TextBlock(Localization.lang("**Quick reference:**\n- Press **Ctrl+F** to jump to search\n- Use **field = value** for field searches\n- Combine with **AND**, **OR**, **NOT**\n- Enable **regex** for pattern matching")),
+                                new InfoBlock(Localization.lang("For complete search documentation and more examples, visit [Search documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/search)")))
+                        .continueButton(Localization.lang("Finish"))
+                        .position(PanelPosition.RIGHT)
+                        .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT))
+                .build();
+    }
+
     private Walkthrough createMainFileDirectoryWalkthrough() {
         WindowResolver mainResolver = () -> Optional.of(stage);
         WalkthroughEffect preferenceHighlight = new WalkthroughEffect(
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
index 1d82ce74584..0b4948df3a1 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
@@ -7,6 +7,7 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBase;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.DialogPane;
@@ -17,9 +18,11 @@
 import org.jabref.gui.icon.JabRefIconView;
 import org.jabref.logic.l10n.Localization;
 
+import com.google.common.collect.Streams;
 import com.sun.javafx.scene.control.LabeledText;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
+import org.kordamp.ikonli.javafx.FontIcon;
 
 /// Resolves nodes from a Scene
 @FunctionalInterface
@@ -41,7 +44,7 @@ static NodeResolver selector(@NonNull String selector) {
     /// Creates a resolver that finds a node by its fx:id.
     ///
     /// @param fxId the fx:id of the node
-    /// @return a resolver that finds the node by fx:id
+    /// @returWn a resolver that finds the node by fx:id
     static NodeResolver fxId(@NonNull String fxId) {
         return scene -> Optional.ofNullable(scene.lookup("#" + fxId));
     }
@@ -51,12 +54,17 @@ static NodeResolver fxId(@NonNull String fxId) {
     /// @param glyph the graphic of the button
     /// @return a resolver that finds the button by graphic
     static NodeResolver buttonWithGraphic(IconTheme.JabRefIcons glyph) {
-        return scene -> scene.getRoot().lookupAll(".button").stream()
-                             .filter(node -> node instanceof Button button
-                                     && Optional.ofNullable(findNode(button.getGraphic(), JabRefIconView.class::isInstance))
-                                                .map(JabRefIconView.class::cast).filter(icon -> icon.getGlyph() == glyph)
-                                                .isPresent())
-                             .findFirst();
+        return scene -> Streams.concat(scene.getRoot().lookupAll(".button").stream(),
+                                       scene.getRoot().lookupAll(".icon-button").stream())
+                               .filter(node -> {
+                                   if (!(node instanceof ButtonBase button)) {
+                                       return false;
+                                   }
+                                   Node graphic = button.getGraphic();
+                                   return (graphic instanceof JabRefIconView jabRefIconView) && jabRefIconView.getGlyph() == glyph ||
+                                           (graphic instanceof FontIcon fontIcon) && fontIcon.getIconCode() == glyph.getIkon();
+                               })
+                               .findFirst();
     }
 
     /// Creates a resolver that finds a node by a predicate.
@@ -82,8 +90,8 @@ static NodeResolver action(@NonNull StandardActions action) {
     /// @return a resolver that finds the button by button type
     static NodeResolver buttonType(@NonNull ButtonType buttonType) {
         return scene -> predicate(DialogPane.class::isInstance)
-                                .resolve(scene)
-                                .map(node -> node instanceof DialogPane pane ? pane.lookupButton(buttonType) : null);
+                .resolve(scene)
+                .map(node -> node instanceof DialogPane pane ? pane.lookupButton(buttonType) : null);
     }
 
     /// Creates a resolver that finds a node by selector first, then predicate.
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index fe509968d7d..a9fb1d0d967 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -7,15 +7,17 @@
 import javafx.collections.ListChangeListener;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.Button;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
+import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
@@ -24,6 +26,7 @@
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.WorkspacePreferences;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.edit.OpenBrowserAction;
 import org.jabref.gui.frame.FileHistoryMenu;
@@ -31,10 +34,12 @@
 import org.jabref.gui.importer.NewDatabaseAction;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.preferences.GuiPreferences;
+import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.URLs;
-import org.jabref.gui.walkthrough.WalkthroughAction;
+import org.jabref.gui.welcome.components.DonationProvider;
 import org.jabref.gui.welcome.components.QuickSettings;
+import org.jabref.gui.welcome.components.Walkthroughs;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -66,6 +71,11 @@ public class WelcomeTab extends Tab {
     private final FileHistoryMenu fileHistoryMenu;
     private final BuildInfo buildInfo;
     private final Stage stage;
+    private final WorkspacePreferences workspacePreferences;
+    private final ThemeManager themeManager;
+    private Walkthroughs walkthroughs;
+
+    private QuickSettings quickSettings;
 
     public WelcomeTab(Stage stage,
                       LibraryTabContainer tabContainer,
@@ -79,7 +89,9 @@ public WelcomeTab(Stage stage,
                       ClipBoardManager clipBoardManager,
                       TaskExecutor taskExecutor,
                       FileHistoryMenu fileHistoryMenu,
-                      BuildInfo buildInfo) {
+                      BuildInfo buildInfo,
+                      WorkspacePreferences workspacePreferences,
+                      ThemeManager themeManager) {
         super(Localization.lang("Welcome"));
         setClosable(true);
         this.tabContainer = tabContainer;
@@ -95,27 +107,27 @@ public WelcomeTab(Stage stage,
         this.fileHistoryMenu = fileHistoryMenu;
         this.buildInfo = buildInfo;
         this.stage = stage;
+        this.workspacePreferences = workspacePreferences;
+        this.themeManager = themeManager;
         this.recentLibrariesBox = new VBox();
         recentLibrariesBox.getStyleClass().add("welcome-recent-libraries");
 
-        VBox mainContainer = new VBox(createTopTitles(), createColumnsContainer(), createCommunityBox());
-        mainContainer.getStyleClass().add("welcome-main-container");
+        Node titles = createTopTitles();
+        Node communityBox = createCommunityBox();
+        ScrollPane columnsScroll = createColumnsContainerScrollable();
 
-        VBox container = new VBox();
-        container.getChildren().add(mainContainer);
-        VBox.setVgrow(mainContainer, Priority.ALWAYS);
+        VBox mainStack = new VBox(titles, columnsScroll, communityBox);
+        mainStack.getStyleClass().add("welcome-main-container");
+        VBox.setVgrow(columnsScroll, Priority.ALWAYS);
+
+        VBox container = new VBox(mainStack);
         container.setAlignment(Pos.CENTER);
 
-        setContent(container);
-    }
+        StackPane rootPane = new StackPane(container);
+        setContent(rootPane);
 
-    private Button createWalkthroughButton(String text, IconTheme.JabRefIcons icon, String walkthroughId) {
-        Button button = new Button(text);
-        button.setGraphic(icon.getGraphicNode());
-        button.getStyleClass().add("quick-settings-button");
-        button.setMaxWidth(Double.MAX_VALUE);
-        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, walkthroughId).execute());
-        return button;
+        DonationProvider donationProvider = new DonationProvider(rootPane, preferences, dialogService);
+        donationProvider.showIfNeeded();
     }
 
     private VBox createTopTitles() {
@@ -123,23 +135,31 @@ private VBox createTopTitles() {
         welcomeLabel.getStyleClass().add("welcome-label");
         Label descriptionLabel = new Label(Localization.lang("Stay on top of your literature"));
         descriptionLabel.getStyleClass().add("welcome-description-label");
-        VBox topTitles = new VBox();
+        VBox topTitles = new VBox(welcomeLabel, descriptionLabel);
         topTitles.getStyleClass().add("welcome-top-titles");
-        topTitles.getChildren().addAll(welcomeLabel, descriptionLabel);
         return topTitles;
     }
 
-    private HBox createColumnsContainer() {
+    private ScrollPane createColumnsContainerScrollable() {
+        GridPane grid = new GridPane();
+        grid.getStyleClass().add("welcome-columns-container");
+
         VBox leftColumn = createLeftColumn();
+        GridPane.setHgrow(leftColumn, Priority.ALWAYS);
+
         VBox rightColumn = createRightColumn();
-        HBox columnsContainer = new HBox();
-        columnsContainer.getStyleClass().add("welcome-columns-container");
-        leftColumn.getStyleClass().add("welcome-left-column");
-        rightColumn.getStyleClass().add("welcome-right-column");
-        HBox.setHgrow(leftColumn, Priority.ALWAYS);
-        HBox.setHgrow(rightColumn, Priority.ALWAYS);
-        columnsContainer.getChildren().addAll(leftColumn, rightColumn);
-        return columnsContainer;
+        GridPane.setHgrow(rightColumn, Priority.ALWAYS);
+
+        Runnable applyLayout = () -> updateColumnsLayout(grid, leftColumn, rightColumn, grid.getWidth());
+        grid.widthProperty().addListener((_, _, _) -> applyLayout.run());
+        applyLayout.run();
+
+        ScrollPane scrollPane = new ScrollPane(grid);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.getStyleClass().add("welcome-columns-scroll");
+        return scrollPane;
     }
 
     private VBox createLeftColumn() {
@@ -152,68 +172,39 @@ private VBox createLeftColumn() {
     }
 
     private VBox createRightColumn() {
-        VBox rightColumn = new VBox(new QuickSettings(), createWalkthroughBox());
+        this.quickSettings = new QuickSettings(preferences, dialogService, taskExecutor, themeManager);
+        this.walkthroughs = new Walkthroughs(stage, tabContainer, stateManager);
+        VBox rightColumn = new VBox(quickSettings, walkthroughs);
         rightColumn.getStyleClass().add("welcome-content-column");
+        VBox.setVgrow(quickSettings, Priority.ALWAYS);
+        VBox.setVgrow(walkthroughs, Priority.ALWAYS);
         return rightColumn;
     }
 
-    private VBox createWalkthroughBox() {
-        Label header = new Label(Localization.lang("Walkthroughs"));
-        header.getStyleClass().add("welcome-header-label");
-
-        VBox walkthroughsContainer = new VBox();
-        walkthroughsContainer.getStyleClass().add("walkthroughs-container");
-
-        Button mainFileDirWalkthroughButton = createWalkthroughButton(
-                Localization.lang("Set main file directory"),
-                IconTheme.JabRefIcons.FOLDER,
-                WalkthroughAction.MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME
-        );
-
-        Button entryTableWalkthroughButton = createWalkthroughButton(
-                Localization.lang("Customize entry table"),
-                IconTheme.JabRefIcons.TOGGLE_GROUPS,
-                WalkthroughAction.CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME
-        );
-
-        Button linkPdfWalkthroughButton = createWalkthroughButton(
-                Localization.lang("Link PDF to entries"),
-                IconTheme.JabRefIcons.PDF_FILE,
-                WalkthroughAction.PDF_LINK_WALKTHROUGH_NAME
-        );
-
-        Button groupButton = createWalkthroughButton(
-                Localization.lang("Add group"),
-                IconTheme.JabRefIcons.NEW_GROUP,
-                WalkthroughAction.GROUP_WALKTHROUGH_NAME
-        );
-
-        walkthroughsContainer.getChildren().addAll(
-                mainFileDirWalkthroughButton,
-                entryTableWalkthroughButton,
-                linkPdfWalkthroughButton,
-                groupButton
-        );
-
-        ScrollPane scrollPane = new ScrollPane(walkthroughsContainer);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.getStyleClass().add("walkthroughs-scroll-pane");
-
-        return createVBoxContainer(header, scrollPane);
-    }
-
-    private VBox createCommunityBox() {
-        Label header = new Label(Localization.lang("Community"));
-        header.getStyleClass().add("welcome-header-label");
-        FlowPane iconLinksContainer = createIconLinksContainer();
-        HBox textLinksContainer = createTextLinksContainer();
-        HBox versionContainer = createVersionContainer();
-        VBox container = new VBox();
-        container.getStyleClass().add("welcome-community-content");
-        container.getChildren().addAll(iconLinksContainer, textLinksContainer, versionContainer);
-        return createVBoxContainer(header, container);
+    private void updateColumnsLayout(GridPane grid, VBox leftColumn, VBox rightColumn, double availableWidth) {
+        grid.getChildren().clear();
+        grid.getColumnConstraints().clear();
+
+        double threshold = 48 * workspacePreferences.getMainFontSize();
+        if (availableWidth < threshold) {
+            grid.getStyleClass().add("compact");
+            ColumnConstraints single = new ColumnConstraints();
+            single.setPercentWidth(100);
+            grid.getColumnConstraints().add(single);
+            grid.add(leftColumn, 0, 0);
+            grid.add(rightColumn, 0, 1);
+            quickSettings.disableScroll();
+            walkthroughs.disableScroll();
+        } else {
+            grid.getStyleClass().remove("compact");
+            ColumnConstraints half = new ColumnConstraints();
+            half.setPercentWidth(50);
+            grid.getColumnConstraints().addAll(half, half);
+            grid.add(leftColumn, 0, 0);
+            grid.add(rightColumn, 1, 0);
+            quickSettings.enableScroll();
+            walkthroughs.enableScroll();
+        }
     }
 
     private VBox createWelcomeStartBox() {
@@ -299,11 +290,16 @@ private void displayNoRecentLibrariesMessage() {
         fileHistoryMenu.setDisable(true);
     }
 
-    private VBox createVBoxContainer(Node... nodes) {
-        VBox box = new VBox();
-        box.getStyleClass().add("welcome-section");
-        box.getChildren().addAll(nodes);
-        return box;
+    private VBox createCommunityBox() {
+        Label header = new Label(Localization.lang("Community"));
+        header.getStyleClass().add("welcome-header-label");
+        FlowPane iconLinksContainer = createIconLinksContainer();
+        HBox textLinksContainer = createTextLinksContainer();
+        HBox versionContainer = createVersionContainer();
+        VBox container = new VBox();
+        container.getStyleClass().add("welcome-community-content");
+        container.getChildren().addAll(iconLinksContainer, textLinksContainer, versionContainer);
+        return createVBoxContainer(header, container);
     }
 
     private FlowPane createIconLinksContainer() {
@@ -363,4 +359,11 @@ private HBox createVersionContainer() {
         container.getChildren().add(versionLabel);
         return container;
     }
+
+    private VBox createVBoxContainer(Node... nodes) {
+        VBox box = new VBox();
+        box.getStyleClass().add("welcome-section");
+        box.getChildren().addAll(nodes);
+        return box;
+    }
 }
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java
index f496a101dc4..f853151d6fe 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/QuickSettings.java
@@ -1,9 +1,12 @@
 package org.jabref.gui.welcome.components;
 
-import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.welcome.quicksettings.EntryTableConfigurationDialog;
@@ -12,49 +15,128 @@
 import org.jabref.gui.welcome.quicksettings.OnlineServicesDialog;
 import org.jabref.gui.welcome.quicksettings.PushApplicationDialog;
 import org.jabref.gui.welcome.quicksettings.ThemeDialog;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class QuickSettings extends VBox {
-    @Inject private GuiPreferences preferences;
-    @Inject private DialogService dialogService;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private ThemeManager themeManager;
+    private final GuiPreferences preferences;
+    private final DialogService dialogService;
+    private final TaskExecutor taskExecutor;
+
+    private final ThemeManager themeManager;
+    private final Label header;
+    private boolean isScrollEnabled = true;
+
+    public QuickSettings(GuiPreferences preferences, DialogService dialogService, TaskExecutor taskExecutor, ThemeManager themeManager) {
+        this.preferences = preferences;
+        this.dialogService = dialogService;
+        this.taskExecutor = taskExecutor;
+        this.themeManager = themeManager;
+
+        getStyleClass().add("welcome-section");
+
+        header = new Label(Localization.lang("Quick settings"));
+        header.getStyleClass().add("welcome-header-label");
+        enableScroll();
+    }
+
+    public void enableScroll() {
+        if (isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = true;
+        getChildren().clear();
+        getChildren().addAll(header, createScrollPane(createContent()));
+    }
+
+    public void disableScroll() {
+        if (!isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = false;
+        getChildren().clear();
+        getChildren().addAll(header, createContent());
+    }
+
+    private VBox createContent() {
+        Button mainFileDirButton = createButton(
+                Localization.lang("Set main file directory"),
+                IconTheme.JabRefIcons.FOLDER,
+                this::showMainFileDirectoryDialog);
+
+        Button themeButton = createButton(
+                Localization.lang("Change visual theme"),
+                IconTheme.JabRefIcons.PREFERENCES,
+                this::showThemeDialog);
+
+        Button largeLibraryButton = createButton(
+                Localization.lang("Optimize for large libraries"),
+                IconTheme.JabRefIcons.SELECTORS,
+                this::showLargeLibraryOptimizationDialog);
+
+        Button pushApplicationButton = createButton(
+                Localization.lang("Configure push to applications"),
+                IconTheme.JabRefIcons.APPLICATION_GENERIC,
+                this::showPushApplicationConfigurationDialog);
+
+        Button onlineServicesButton = createButton(
+                Localization.lang("Configure web search services"),
+                IconTheme.JabRefIcons.WWW,
+                this::showOnlineServicesConfigurationDialog);
+
+        Button entryTableButton = createButton(
+                Localization.lang("Customize entry table"),
+                IconTheme.JabRefIcons.TOGGLE_GROUPS,
+                this::showEntryTableConfigurationDialog);
+
+        VBox newContent = new VBox(mainFileDirButton,
+                                 themeButton,
+                                 largeLibraryButton,
+                                 entryTableButton,
+                                 pushApplicationButton,
+                                 onlineServicesButton);
+        newContent.getStyleClass().add("quick-settings-container");
+        return newContent;
+    }
+
+    private ScrollPane createScrollPane(VBox contentPane) {
+        ScrollPane newScrollPane = new ScrollPane(contentPane);
+        newScrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        newScrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        newScrollPane.setFitToWidth(true);
+        newScrollPane.getStyleClass().add("quick-settings-scroll-pane");
+        return newScrollPane;
+    }
 
-    public QuickSettings() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    private Button createButton(String text, IconTheme.JabRefIcons icon, Runnable action) {
+        Button button = new Button(text);
+        button.setGraphic(icon.getGraphicNode());
+        button.getStyleClass().add("quick-settings-button");
+        button.setMaxWidth(Double.MAX_VALUE);
+        button.setOnAction(event -> action.run());
+        return button;
     }
 
-    @FXML
     private void showMainFileDirectoryDialog() {
         dialogService.showCustomDialogAndWait(new MainFileDirectoryDialog(preferences, dialogService, themeManager));
     }
 
-    @FXML
     private void showThemeDialog() {
         dialogService.showCustomDialogAndWait(new ThemeDialog(preferences, dialogService, themeManager));
     }
 
-    @FXML
     private void showLargeLibraryOptimizationDialog() {
         dialogService.showCustomDialogAndWait(new LargeLibraryOptimizationDialog(preferences, themeManager));
     }
 
-    @FXML
     private void showPushApplicationConfigurationDialog() {
         dialogService.showCustomDialogAndWait(new PushApplicationDialog(preferences, dialogService, taskExecutor, themeManager));
     }
 
-    @FXML
     private void showOnlineServicesConfigurationDialog() {
         dialogService.showCustomDialogAndWait(new OnlineServicesDialog(preferences, themeManager));
     }
 
-    @FXML
     private void showEntryTableConfigurationDialog() {
         dialogService.showCustomDialogAndWait(new EntryTableConfigurationDialog(preferences, themeManager));
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
new file mode 100644
index 00000000000..6a45cb04a3f
--- /dev/null
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
@@ -0,0 +1,104 @@
+package org.jabref.gui.welcome.components;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+
+import org.jabref.gui.LibraryTabContainer;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.walkthrough.WalkthroughAction;
+import org.jabref.logic.l10n.Localization;
+
+public class Walkthroughs extends VBox {
+    private final Stage stage;
+    private final LibraryTabContainer tabContainer;
+    private final StateManager stateManager;
+
+    private final Label header;
+    private boolean isScrollEnabled = true;
+
+    public Walkthroughs(Stage stage, LibraryTabContainer tabContainer, StateManager stateManager) {
+        this.stage = stage;
+        this.tabContainer = tabContainer;
+        this.stateManager = stateManager;
+
+        getStyleClass().add("welcome-section");
+
+        header = new Label(Localization.lang("Walkthroughs"));
+        header.getStyleClass().add("welcome-header-label");
+        enableScroll();
+    }
+
+    public void enableScroll() {
+        if (isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = true;
+        getChildren().clear();
+        getChildren().addAll(header, createScrollPane(createWalkthroughContent()));
+    }
+
+    public void disableScroll() {
+        if (!isScrollEnabled) {
+            return;
+        }
+        isScrollEnabled = false;
+        getChildren().clear();
+        getChildren().addAll(header, createWalkthroughContent());
+    }
+
+    private VBox createWalkthroughContent() {
+        VBox content = new VBox();
+        content.getStyleClass().add("walkthroughs-container");
+
+        Button mainFileDirWalkthroughButton = createWalkthroughButton(
+                Localization.lang("Set main file directory"),
+                IconTheme.JabRefIcons.FOLDER,
+                WalkthroughAction.MAIN_FILE_DIRECTORY_WALKTHROUGH_NAME);
+        Button entryTableWalkthroughButton = createWalkthroughButton(
+                Localization.lang("Customize entry table"),
+                IconTheme.JabRefIcons.TOGGLE_GROUPS,
+                WalkthroughAction.CUSTOMIZE_ENTRY_TABLE_WALKTHROUGH_NAME);
+        Button linkPdfWalkthroughButton = createWalkthroughButton(
+                Localization.lang("Link PDF to entries"),
+                IconTheme.JabRefIcons.PDF_FILE,
+                WalkthroughAction.PDF_LINK_WALKTHROUGH_NAME);
+        Button groupButton = createWalkthroughButton(
+                Localization.lang("Add group"),
+                IconTheme.JabRefIcons.NEW_GROUP,
+                WalkthroughAction.GROUP_WALKTHROUGH_NAME);
+        Button searchButton = createWalkthroughButton(
+                Localization.lang("Search your library"),
+                IconTheme.JabRefIcons.SEARCH,
+                WalkthroughAction.SEARCH_WALKTHROUGH_NAME);
+
+        content.getChildren().addAll(
+                mainFileDirWalkthroughButton,
+                entryTableWalkthroughButton,
+                linkPdfWalkthroughButton,
+                groupButton,
+                searchButton);
+        return content;
+    }
+
+    private ScrollPane createScrollPane(VBox content) {
+        ScrollPane newScrollPane = new ScrollPane(content);
+        newScrollPane.setFitToWidth(true);
+        newScrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        newScrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        newScrollPane.getStyleClass().add("walkthroughs-scroll-pane");
+        return newScrollPane;
+    }
+
+    private Button createWalkthroughButton(String text, IconTheme.JabRefIcons icon, String walkthroughId) {
+        Button button = new Button(text);
+        button.setGraphic(icon.getGraphicNode());
+        button.getStyleClass().add("quick-settings-button");
+        button.setMaxWidth(Double.MAX_VALUE);
+        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, walkthroughId).execute());
+        return button;
+    }
+}
diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index 4c0d017610a..e04641fbe97 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -1752,6 +1752,7 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-font-size: 1.5em;
     -fx-font-weight: bold;
     -fx-font-family: "Arial";
+    -fx-text-fill: -jr-gray-3;
 }
 
 .welcome-no-recent-label {
@@ -1778,6 +1779,13 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-padding: 2.667em 2em;
 }
 
+.welcome-columns-container,
+.welcome-columns-container:focus,
+.welcome-columns-scroll,
+.welcome-columns-scroll:focus {
+    -fx-background-color: transparent;
+}
+
 .welcome-top-titles {
     -fx-spacing: 0.833em;
     -fx-alignment: left;
@@ -1785,7 +1793,8 @@ We want to have a look that matches our icons in the tool-bar */
 }
 
 .welcome-columns-container {
-    -fx-spacing: 3.333em;
+    -fx-hgap: 2.083em;
+    -fx-vgap: 2.083em;
     -fx-alignment: top-center;
 }
 
@@ -2586,15 +2595,14 @@ journalInfo .grid-cell-b {
 /* Quick Settings */
 .quick-settings-container,
 .walkthroughs-container {
-    -fx-spacing: 0.6667em;
+    -fx-spacing: 0.3333em;
     -fx-alignment: top-left;
 }
 
 .walkthroughs-scroll-pane,
 .quick-settings-scroll-pane {
-    -fx-max-height: 13.333em; /* item-size * 4 + gap * 3 = (0.0833 * 2 + 0.833 * 2 + 1) * 4 + 0.667 * 3 */
-    -fx-min-height: 13.333em;
-    -fx-pref-height: 13.333em;
+    -fx-max-height: 12em;
+    -fx-pref-height: 12em;
 }
 
 .quick-settings-button {
@@ -2659,7 +2667,7 @@ journalInfo .grid-cell-b {
     -fx-border-width: 0.0625em;
     -fx-border-radius: 0.25em;
     -fx-background-radius: 0.25em;
-    -fx-effect: dropshadow(three-pass-box , rgba(0,0,0,0.1) , 0.125em, 0.0 , 0 , 0.0625em );
+    -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.1), 0.125em, 0.0, 0, 0.0625em);
     -fx-border-color: -jr-wf-border-color;
 }
 
@@ -2836,14 +2844,12 @@ journalInfo .grid-cell-b {
     -fx-max-width: infinity;
 }
 
-.walkthrough-tooltip-title,
-.walkthrough-title,
-.walkthrough-tooltip-title .markdown-h2,
-.walkthrough-title .markdown-h2 {
+.walkthrough-tooltip-title > *,
+.walkthrough-title > * {
     -fx-text-fill: -jr-theme;
     -fx-fill: -jr-theme;
     -fx-font-weight: bold;
-    -fx-font-size: 1.75em;
+    -fx-font-size: 2em;
     -fx-line-spacing: -0.25em;
 }
 
@@ -2876,7 +2882,7 @@ journalInfo .grid-cell-b {
 }
 
 .walkthrough-text-content {
-    -fx-text-fill: -jr-gray-3;
+    -fx-text-fill: -fx-text-base-color;
     -fx-font-size: 1.2em;
     -fx-line-spacing: 0.5em;
 }
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
index cab859b9ac9..d3b67bea682 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -74,6 +74,7 @@
     <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
     <CheckBox fx:id="shouldAskForIncludingCrossReferences" text="%Ask whether to include cross-references when copying to another library"/>
     <CheckBox fx:id="confirmHideTabBar" text="%Hide tab bar when single library is present"/>
+    <CheckBox fx:id="donationNeverShow" text="%Do not show donation prompt again"/>
 
     <Label styleClass="sectionHeader" text="%Single instance" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml b/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
deleted file mode 100644
index b40eca9007e..00000000000
--- a/jabgui/src/main/resources/org/jabref/gui/welcome/components/QuickSettings.fxml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-
-<fx:root type="VBox" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.welcome.components.QuickSettings"
-         styleClass="welcome-section">
-    <Label styleClass="welcome-header-label" text="%Quick settings"/>
-    <ScrollPane fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="AS_NEEDED"
-                styleClass="quick-settings-scroll-pane">
-        <VBox styleClass="quick-settings-container">
-            <Button fx:id="mainFileDirButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Set main file directory"
-                    onAction="#showMainFileDirectoryDialog">
-                <graphic>
-                    <JabRefIconView glyph="FOLDER"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="themeButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Change visual theme"
-                    onAction="#showThemeDialog">
-                <graphic>
-                    <JabRefIconView glyph="PREFERENCES"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="largeLibraryButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Optimize for large libraries"
-                    onAction="#showLargeLibraryOptimizationDialog">
-                <graphic>
-                    <JabRefIconView glyph="SELECTORS"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="pushApplicationButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Configure push to applications"
-                    onAction="#showPushApplicationConfigurationDialog">
-                <graphic>
-                    <JabRefIconView glyph="APPLICATION_GENERIC"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="onlineServicesButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Configure web search services"
-                    onAction="#showOnlineServicesConfigurationDialog">
-                <graphic>
-                    <JabRefIconView glyph="WWW"/>
-                </graphic>
-            </Button>
-
-            <Button fx:id="entryTableButton" styleClass="quick-settings-button"
-                    maxWidth="Infinity" text="%Customize entry table"
-                    onAction="#showEntryTableConfigurationDialog">
-                <graphic>
-                    <JabRefIconView glyph="TOGGLE_GROUPS"/>
-                </graphic>
-            </Button>
-        </VBox>
-    </ScrollPane>
-</fx:root>
diff --git a/jablib/src/main/resources/SearchExamples.bib b/jablib/src/main/resources/SearchExamples.bib
new file mode 100644
index 00000000000..061e4a2d50c
--- /dev/null
+++ b/jablib/src/main/resources/SearchExamples.bib
@@ -0,0 +1,194 @@
+@Article{LeCun2015,
+  author    = {LeCun, Yann and Bengio, Yoshua and Hinton, Geoffrey},
+  title     = {Deep learning},
+  doi       = {10.1038/nature14539},
+  issn      = {1476-4687},
+  number    = {7553},
+  pages     = {436--444},
+  volume    = {521},
+  journal   = {Nature},
+  month     = may,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2015},
+}
+
+@Misc{Vaswani2017,
+  author    = {Vaswani, Ashish and Shazeer, Noam and Parmar, Niki and Uszkoreit, Jakob and Jones, Llion and Gomez, Aidan N. and Kaiser, Lukasz and Polosukhin, Illia},
+  title     = {Attention is all you need},
+  doi       = {10.48550/ARXIV.1706.03762},
+  copyright = {arXiv.org perpetual, non-exclusive license},
+  keywords  = {Computation and Language (cs.CL), Machine Learning (cs.LG), FOS: Computer and information sciences, FOS: Computer and information sciences},
+  publisher = {arXiv},
+  year      = {2017},
+}
+
+@Article{Silver2016,
+  author    = {Silver, David and Huang, Aja and Maddison, Chris J. and Guez, Arthur and Sifre, Laurent and van den Driessche, George and Schrittwieser, Julian and Antonoglou, Ioannis and Panneershelvam, Veda and Lanctot, Marc and Dieleman, Sander and Grewe, Dominik and Nham, John and Kalchbrenner, Nal and Sutskever, Ilya and Lillicrap, Timothy and Leach, Madeleine and Kavukcuoglu, Koray and Graepel, Thore and Hassabis, Demis},
+  title     = {Mastering the game of {Go} with deep neural networks and tree search},
+  doi       = {10.1038/nature16961},
+  issn      = {1476-4687},
+  number    = {7587},
+  pages     = {484--489},
+  volume    = {529},
+  journal   = {Nature},
+  month     = jan,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2016},
+}
+
+@Article{Esteva2017,
+  author    = {Esteva, Andre and Kuprel, Brett and Novoa, Roberto A. and Ko, Justin and Swetter, Susan M. and Blau, Helen M. and Thrun, Sebastian},
+  title     = {Dermatologist-level classification of skin cancer with deep neural networks},
+  doi       = {10.1038/nature21056},
+  issn      = {1476-4687},
+  number    = {7639},
+  pages     = {115--118},
+  volume    = {542},
+  journal   = {Nature},
+  month     = jan,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2017},
+}
+
+@Article{Tian2025,
+  author    = {Tian, Yingjie and Wen, Haonan and Guo, Kun},
+  title     = {Machine learning applications in climate finance: An overview},
+  doi       = {10.1016/j.ribaf.2025.103063},
+  issn      = {0275-5319},
+  pages     = {103063},
+  journal   = {Research in International Business and Finance},
+  month     = aug,
+  publisher = {Elsevier BV},
+  year      = {2025},
+}
+
+@Article{Supriyono2024,
+  author    = {Supriyono and Wibawa, Aji Prasetya and Suyono and Kurniawan, Fachrul},
+  title     = {Advancements in natural language processing: Implications, challenges, and future directions},
+  doi       = {10.1016/j.teler.2024.100173},
+  issn      = {2772-5030},
+  pages     = {100173},
+  volume    = {16},
+  journal   = {Telematics and Informatics Reports},
+  month     = dec,
+  publisher = {Elsevier BV},
+  year      = {2024},
+}
+
+@Article{Kumar2025,
+  author    = {Kumar, Narendra and Kumar, Krishna and Aeron, Anurag and Verre, Filippo},
+  title     = {Blockchain technology in supply chain management: Innovations, applications, and challenges},
+  doi       = {10.1016/j.teler.2025.100204},
+  issn      = {2772-5030},
+  pages     = {100204},
+  volume    = {18},
+  journal   = {Telematics and Informatics Reports},
+  month     = jun,
+  publisher = {Elsevier BV},
+  year      = {2025},
+}
+
+@Article{Watson1953,
+  author    = {Watson, J. D. and Crick, F. H. C.},
+  title     = {Molecular structure of nucleic acids: a structure for deoxyribose nucleic acid},
+  doi       = {10.1038/171737a0},
+  issn      = {1476-4687},
+  number    = {4356},
+  pages     = {737--738},
+  volume    = {171},
+  abstract  = {WE wish to suggest a structure for the salt of deoxyribose nucleic acid (DNA). This structure has novel features which are of considerable biological interest.
+
+A structure for nucleic acid has already been proposed by Pauling and Corey1. They kindly made their manuscript available to us in advance of publication. Their model consists of three intertwined chains, with the phosphates near the fibre axis, and the bases on the outside. In our opinion, this structure is unsatisfactory for two reasons : (1) We believe that the material which gives the X-ray diagrams is the salt, not the free acid. Without the acidic hydrogen atoms it is not clear what forces would hold the structure together, especially as the negatively charged phosphates near the axis will repel each other. (2) Some of the van der Waals distances appear to be too small.},
+  journal   = {Nature},
+  month     = apr,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {1953},
+}
+
+@Article{Matson2024,
+  author    = {Matson, Robert P. and Comba, Isin Y. and Silvert, Eli and Niesen, Michiel J. M. and Murugadoss, Karthik and Patwardhan, Dhruti and Suratekar, Rohit and Goel, Elizabeth-Grace and Poelaert, Brittany J. and Wan, Kanny K. and Brimacombe, Kyle R. and Venkatakrishnan, AJ and Soundararajan, Venky},
+  title     = {A deep learning approach predicting the activity of {COVID-19} therapeutics and vaccines against emerging variants},
+  doi       = {10.1038/s41540-024-00471-0},
+  issn      = {2056-7189},
+  number    = {1},
+  volume    = {10},
+  journal   = {npj Systems Biology and Applications},
+  month     = nov,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2024},
+}
+
+@Article{Kumar2024,
+  author    = {Kumar, Neelam Sanjeev and Deepika, G. and Goutham, V. and Buvaneswari, B. and Reddy, R. Vijaya Kumar and Angadi, Sanjeevkumar and Dhanamjayulu, C. and Chinthaginjala, Ravikumar and Mohammad, Faruq and Khan, Baseem},
+  title     = {{HARNet} in deep learning approach---a systematic survey},
+  doi       = {10.1038/s41598-024-58074-y},
+  issn      = {2045-2322},
+  number    = {1},
+  volume    = {14},
+  journal   = {Scientific Reports},
+  month     = apr,
+  publisher = {Springer Science and Business Media LLC},
+  year      = {2024},
+}
+
+@Book{WHO2023,
+  author      = {{World Health Organization}},
+  date        = {2023},
+  title       = {World health statistics 2023: monitoring health for the {SDGs}, sustainable development goals},
+  edition     = {First},
+  isbn        = {9789240074323},
+  note        = {Description based on publisher supplied metadata and other sources.},
+  pagetotal   = {1136},
+  subtitle    = {Monitoring Health for the SDGs, Sustainable Development Goals},
+  address     = {Geneva},
+  ppn_gvk     = {1907990577},
+  shortauthor = {WHO},
+}
+
+@Article{Morgan1923,
+  author       = {T. H. Morgan},
+  date         = {1923},
+  journaltitle = {The Scientific Monthly},
+  title        = {The Bearing of Mendelism on the Origin of Species},
+  issn         = {00963771},
+  number       = {3},
+  pages        = {237--247},
+  url          = {http://www.jstor.org/stable/6477},
+  urldate      = {2025-08-10},
+  volume       = {16},
+  publisher    = {American Association for the Advancement of Science},
+}
+
+@Misc{Kirillov2023,
+  author      = {Alexander Kirillov and Eric Mintun and Nikhila Ravi and Hanzi Mao and Chloe Rolland and Laura Gustafson and Tete Xiao and Spencer Whitehead and Alexander C. Berg and Wan-Yen Lo and Piotr Dollár and Ross Girshick},
+  date        = {2023},
+  title       = {Segment Anything},
+  eprint      = {2304.02643},
+  eprintclass = {cs.CV},
+  eprinttype  = {arXiv},
+  url         = {https://arxiv.org/abs/2304.02643},
+}
+
+@Article{Khalifa2021,
+  author       = {Khalifa, Shaden A. M. and Swilam, Mahmoud M. and El-Wahed, Aida A. Abd and Du, Ming and El-Seedi, Haged H. R. and Kai, Guoyin and Masry, Saad H. D. and Abdel-Daim, Mohamed M. and Zou, Xiaobo and Halabi, Mohammed F. and Alsharif, Sultan M. and El-Seedi, Hesham R.},
+  date         = {2021-05},
+  journaltitle = {International Journal of Environmental Research and Public Health},
+  title        = {Beyond the pandemic: {COVID-19} pandemic changed the face of life},
+  doi          = {10.3390/ijerph18115645},
+  issn         = {1660-4601},
+  number       = {11},
+  pages        = {5645},
+  volume       = {18},
+  publisher    = {MDPI AG},
+}
+
+@InBook{Chapman1992,
+  author    = {Chapman, Malcolm},
+  booktitle = {The Celts},
+  date      = {1992},
+  title     = {Who are the celts?},
+  doi       = {10.1057/9780230378650_1},
+  isbn      = {9780230378650},
+  pages     = {1--13},
+  publisher = {Palgrave Macmillan UK},
+}
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index c54e43d5b34..9810711348a 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -3139,6 +3139,80 @@ Groups\ walkthrough\ completed=Groups walkthrough completed
 You've\ learned\ how\ to\ create\ groups\ and\ add\ entries\ to\ them.\ Groups\ are\ a\ powerful\ way\ to\ organize\ your\ bibliography\ and\ can\ be\ nested\ to\ create\ hierarchical\ structures.=You've learned how to create groups and add entries to them. Groups are a powerful way to organize your bibliography and can be nested to create hierarchical structures.
 For\ more\ information\ about\ groups\:\ [Groups\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)=For more information about groups: [Groups documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)
 
+# Walkthrough: Search
+Search\ your\ library=Search your library
+Prepare\ search\ settings=Prepare\ search\ settings
+
+# Step 2
+Welcome\ to\ the\ search\ walkthrough=Welcome\ to\ the\ search\ walkthrough
+This\ walkthrough\ will\ guide\ you\ through\ JabRef's\ search\ capabilities.\ We've\ loaded\ a\ sample\ library\ to\ demonstrate\ various\ search\ techniques.=This\ walkthrough\ will\ guide\ you\ through\ JabRef's\ search\ capabilities.\ We've\ loaded\ a\ sample\ library\ to\ demonstrate\ various\ search\ techniques.
+
+# Step 3
+Click\ in\ the\ search\ field\ to\ begin=Click\ in\ the\ search\ field\ to\ begin
+You\ can\ also\ use\ `Ctrl+F`\ or\ `Cmd+F`\ to\ focus\ the\ search\ field.=You\ can\ also\ use\ `Ctrl+F`\ or\ `Cmd+F`\ to\ focus\ the\ search\ field.
+
+# Step 4
+Type\ `machine\ learning`=Type\ `machine\ learning`
+As\ you\ type,\ JabRef\ instantly\ dims\ all\ non-matching\ entries.\ By\ default,\ searches\ are\ case-insensitive\ and\ look\ through\ all\ fields\ like\ title,\ author,\ abstract,\ and\ keywords.=As\ you\ type,\ JabRef\ instantly\ dims\ all\ non-matching\ entries.\ By\ default,\ searches\ are\ case-insensitive\ and\ look\ through\ all\ fields\ like\ title,\ author,\ abstract,\ and\ keywords.
+
+# Step 5
+Understanding\ search\ results=Understanding\ search\ results
+Notice\ how\ entries\ not\ containing\ "machine\ learning"\ are\ dimmed.=Notice\ how\ entries\ not\ containing\ "machine\ learning"\ are\ dimmed.
+This\ found\ entries\ with\ at\ least\ a\ field\ in\ their\ metadata\ (\*e.g.,\*\ title,\ author,\ abstract,\ \*etc.\*\)\ containing\ "machine\ learning".=This\ found\ entries\ with\ at\ least\ a\ field\ in\ their\ metadata\ (\*e.g.,\*\ title,\ author,\ abstract,\ \*etc.\*\)\ containing\ "machine\ learning".
+
+# Step 6
+Toggle\ filter\ mode\ to\ hide\ non-matching\ entries=Toggle\ filter\ mode\ to\ hide\ non-matching\ entries
+Filter\ mode\ shows\ only\ matching\ entries,\ hiding\ everything\ else.=Filter\ mode\ shows\ only\ matching\ entries,\ hiding\ everything\ else.
+
+# Step 7
+Clear\ the\ search\ to\ see\ all\ entries\ again=Clear\ the\ search\ to\ see\ all\ entries\ again
+
+# Step 8
+Type\ `author\ \=\ Son`=Type\ `author\ \=\ Son`
+The\ equals\ sign\ (`\=`)\ means\ "contains"\ and\ is\ case-insensitive\ by\ default.=The\ equals\ sign\ (`\=`)\ means\ "contains"\ and\ is\ case-insensitive\ by\ default.
+This\ query\ finds\ all\ papers\ where\ any\ author's\ name\ contains\ "Son,"\ including\ "Maddison,"\ "Watson,\ J.,"\ or\ "Matson,\ Robert\ P.".\ It\ won't\ match\ "Son"\ appearing\ in\ titles\ or\ abstracts.=This\ query\ finds\ all\ papers\ where\ any\ author's\ name\ contains\ "Son,"\ including\ "Maddison,"\ "Watson,\ J.,"\ or\ "Matson,\ Robert\ P.".\ It\ won't\ match\ "Son"\ appearing\ in\ titles\ or\ abstracts.
+
+# Step 9
+Type\ `date\ \=\=\ 2023`=Type\ `date\ \=\=\ 2023`
+The\ double\ equals\ (`\=\=`)\ means\ exact\ match,\ not\ just\ contains.\ This\ query\ finds\ only\ papers\ with\ field\ "date"\ exactly\ in\ 2023.=The\ double\ equals\ (`\=\=`)\ means\ exact\ match,\ not\ just\ contains.\ This\ query\ finds\ only\ papers\ with\ field\ "date"\ exactly\ in\ 2023.
+With\ single\ equals\ (\*e.g.,\*\ `date\ \=\ 23`),\ you'd\ also\ match\ dates\ like\ 1923\ or\ 2230.=With\ single\ equals\ (\*e.g.,\*\ `date\ \=\ 23`),\ you'd\ also\ match\ dates\ like\ 1923\ or\ 2230.
+
+# Step 10
+Type\ `shortauthor\ \=\ WHO\ AND\ date\ \=\=\ 2023`=Type\ `shortauthor\ \=\ WHO\ AND\ date\ \=\=\ 2023`
+This\ query\ finds\ papers\ by\ WHO\ from\ 2023.\ `AND`\ requires\ both\ conditions\ to\ be\ true.=This\ query\ finds\ papers\ by\ WHO\ from\ 2023.\ `AND`\ requires\ both\ conditions\ to\ be\ true.
+
+# Step 11
+Type\ `title\ \=\ covid\ OR\ title\ \=\ pandemic`=Type `title = covid OR title = pandemic`
+This\ query\ finds\ paper\ with\ title\ containing\ either\ COVID\ or\ pandemics\ in\ general.=This query finds paper with title containing either COVID or pandemics in general.
+`OR`\ can\ be\ satisified\ with\ either\ of\ the\ conditions\ being\ true.=`OR`\ can\ be\ satisified\ with\ either\ of\ the\ conditions\ being\ true.
+
+# Step 12
+Type\ `deep\ learning\ NOT\ title\ \=\ survey`=Type\ `deep\ learning\ NOT\ title\ \=\ survey`
+This\ query\ finds\ entries\ with\ "deep\ learning"\ in\ its\ metadata,\ but\ not\ "survey"\ in\ the\ title.=This\ query\ finds\ entries\ with\ "deep\ learning"\ in\ its\ metadata,\ but\ not\ "survey"\ in\ the\ title.
+NOT\ helps\ you\ filter\ out\ unwanted\ results.=NOT\ helps\ you\ filter\ out\ unwanted\ results.
+
+# Step 13
+Enable\ regular\ expressions\ for\ pattern\ matching=Enable\ regular\ expressions\ for\ pattern\ matching
+Regular\ expressions\ allow\ sophisticated\ pattern\ matching.\ Click\ this\ button\ to\ enable\ regex\ mode\ for\ advanced\ searches.=Regular\ expressions\ allow\ sophisticated\ pattern\ matching.\ Click\ this\ button\ to\ enable\ regex\ mode\ for\ advanced\ searches.
+
+# Step 14
+The\ `\=~`\ operator\ explicitly\ uses\ regex.\ The\ pipe\ operator\ `|`\ allows\ `(deep|machine)`\ matches\ either\ word\ (deep\ or\ machine).\ This\ finds\ "deep\ learning"\ and\ "machine\ learning"\ but\ not\ "learning"\ alone.=The `=~` operator explicitly uses regex. The pipe operator `|` allows `(deep|machine)` matches either word (deep or machine). This finds "deep learning" and "machine learning" but not "learning" alone.
+Type\ `title\ \=~\ \\(deep|machine\\)\ learning`=Type `title =~ \\(deep|machine\\) learning`
+Click\ on\ the\ regex\ button\ on\ previous\ step\ enables\ regex\ mode,\ allowing\ you\ to\ type\ `\\(deep|machine\\)\ learning`\ directly\ to\ search\ for\ any\ entry\ with\ metadata\ matching\ the\ regex.\ If\ you\ use\ `\=~`,\ regardless\ of\ whether\ regex\ mode\ is\ enabled,\ it\ will\ always\ treat\ the\ search\ as\ a\ regex.=Click on the regex button on previous step enables regex mode, allowing you to type `\\(deep|machine\\) learning` directly to search for any entry with metadata matching the regex. If you use `=~`, regardless of whether regex mode is enabled, it will always treat the search as a regex.
+
+# Step 15
+Enable\ case-sensitive\ searching=Enable\ case-sensitive\ searching
+This\ is\ useful\ when\ case\ matters,\ like\ distinguishing\ \"WHO\"\ (World\ Health\ Organization)\ from\ \"who\".=This\ is\ useful\ when\ case\ matters,\ like\ distinguishing\ \"WHO\"\ (World\ Health\ Organization)\ from\ \"who\".
+
+# Step 16
+Type\ `WHO`=Type\ `WHO`
+This\ query\ finds\ entries\ with\ capital\ WHO\ only.\ With\ case\ sensitivity\ on,\ this\ won't\ match\ \"who\"\ or\ \"Who\".=This\ query\ finds\ entries\ with\ capital\ WHO\ only.\ With\ case\ sensitivity\ on,\ this\ won't\ match\ \"who\"\ or\ \"Who\".
+
+# Step 17
+Search\ walkthrough\ completed=Search\ walkthrough\ completed
+**Quick\ reference\:**\n-\ Press\ **Ctrl+F**\ to\ jump\ to\ search\n-\ Use\ **field\ \=\ value**\ for\ field\ searches\n-\ Combine\ with\ **AND**,\ **OR**,\ **NOT**\n-\ Enable\ **regex**\ for\ pattern\ matching=**Quick reference:**\n- Press **Ctrl+F** to jump to search\n- Use **field = value** for field searches\n- Combine with **AND**, **OR**, **NOT**\n- Enable **regex** for pattern matching
+For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/search)=For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/search)
+
 # Walkthrough side effects
 Side\ effect\ timeout=Side effect timeout
 The\ condition\ for\ '%0'\ was\ not\ met\ within\ the\ timeout\ period.=The condition for '%0' was not met within the timeout period.

From e7c27fcb74903f4a2236bd703360415607c4da6d Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:20:05 -0400
Subject: [PATCH 11/22] Additional fix to responsive layout

---
 jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index a9fb1d0d967..8d547549eb3 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -159,6 +159,7 @@ private ScrollPane createColumnsContainerScrollable() {
         scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
         scrollPane.getStyleClass().add("welcome-columns-scroll");
+        scrollPane.setStyle("-fx-background-color: transparent;"); // Using class selector is insufficient to prevent background from turning white on click.
         return scrollPane;
     }
 

From f2ff8be3b9d1a36014d3655fe764af744f1b0248 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:26:30 -0400
Subject: [PATCH 12/22] Fix walkthrough color

---
 jabgui/src/main/resources/org/jabref/gui/Base.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index e04641fbe97..9272a28c390 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -2846,10 +2846,10 @@ journalInfo .grid-cell-b {
 
 .walkthrough-tooltip-title > *,
 .walkthrough-title > * {
-    -fx-text-fill: -jr-theme;
-    -fx-fill: -jr-theme;
+    -fx-text-fill: -jr-theme!important;
+    -fx-fill: -jr-theme!important;
     -fx-font-weight: bold;
-    -fx-font-size: 2em;
+    -fx-font-size: 1.75em;
     -fx-line-spacing: -0.25em;
 }
 

From 08205791bc697d18fc377672424cbd6904f56011 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:28:45 -0400
Subject: [PATCH 13/22] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a89d5a937e3..bb02c480695 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We changed the validation error dialog for overriding the default file directories to a confirmation dialog for saving other preferences under the library properties. [#13488](https://github.com/JabRef/jabref/pull/13488)
 - We improved file exists warning dialog with clearer options and tooltips [#12565](https://github.com/JabRef/jabref/issues/12565)
 - We introduced walkthrough functionality [#12664](https://github.com/JabRef/jabref/issues/12664)
+- We introduced responsive layout in WelcomeTab [#12664](https://github.com/JabRef/jabref/issues/12664)
+- We introduced donation prompt in WelcomeTab [#12664](https://github.com/JabRef/jabref/issues/12664)
 
 ### Fixed
 

From 7df9b4a0ba2bf20e2e027fa95cdc2a85542d63cb Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sun, 10 Aug 2025 15:31:54 -0400
Subject: [PATCH 14/22] Small tweaaks to Walkthroughs

---
 .../java/org/jabref/gui/walkthrough/WalkthroughAction.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index 4948057fec1..18fef13b42d 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -354,6 +354,7 @@ private Walkthrough createGroupWalkthrough() {
                         .resolver(NodeResolver.fxId("descriptionField"))
                         .trigger(Trigger.onTextInput())
                         .position(TooltipPosition.RIGHT)
+                        .continueButton(Localization.lang("Continue"))
                         .activeWindow(WindowResolver.title(Localization.lang("Add group")))
                         .showQuitButton(false)
                         .highlight(groupHighlight))
@@ -559,7 +560,7 @@ private Walkthrough createSearchWalkthrough() {
                         .resolver(NodeResolver.buttonWithGraphic(IconTheme.JabRefIcons.REG_EX))
                         .trigger(Trigger.onClick())
                         .position(TooltipPosition.BOTTOM)
-                        .highlight(HighlightEffect.PING))
+                        .highlight(HighlightEffect.SPOT_LIGHT))
                 // Step 14: Using regex patterns
                 .addStep(WalkthroughStep
                         .tooltip(Localization.lang("Type `title =~ \\(deep|machine\\) learning`"))

From 82b8f24193cc85fff43c976d13008b6227d59ebb Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Mon, 11 Aug 2025 23:41:45 -0400
Subject: [PATCH 15/22] test(donation): Add test to DonationProvider and
 refactored the display calculation

---
 .../welcome/components/DonationProvider.java  | 25 ++++++++-----------
 .../components/DonationProviderTest.java      | 22 ++++++++++++++++
 2 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java

diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
index d9351cd9db7..ff6f01c4aeb 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
@@ -25,7 +25,6 @@
 
 public class DonationProvider {
     private static final int DONATION_INTERVAL_DAYS = 365;
-    private static final int DONATION_FIRST_BACKDATE_DAYS = 348;
     private static final double DONATION_POPUP_ANIM_MS = 200;
     private static final double DONATION_POPUP_TIMEOUT_SECONDS = 15;
     private static final String DONATION_URL = URLs.DONATE_URL;
@@ -47,20 +46,15 @@ public void showIfNeeded() {
             return;
         }
         int lastShown = preferences.getDonationPreferences().getLastShownEpochDay();
+        scheduleAfterDays(calculateDaysUntilNextPopup(lastShown));
+    }
+
+    public int calculateDaysUntilNextPopup(int lastShownEpochDay) {
         int today = (int) LocalDate.now().toEpochDay();
-        if (lastShown < 0) {
-            // 7 days after first-launch, show the donation popup
-            preferences.getDonationPreferences().setLastShownEpochDay(today - DONATION_FIRST_BACKDATE_DAYS);
-            lastShown = preferences.getDonationPreferences().getLastShownEpochDay();
-        }
-        int daysSince = today - lastShown;
-        if (daysSince >= DONATION_INTERVAL_DAYS) {
-            preferences.getDonationPreferences().setLastShownEpochDay(today);
-            showToast();
-            scheduleAfterDays(DONATION_INTERVAL_DAYS);
-        } else {
-            scheduleAfterDays(DONATION_INTERVAL_DAYS - daysSince);
+        if (lastShownEpochDay < 0) {
+            return 7; // 7 days after first-launch, show the donation popup
         }
+        return Math.max(0, DONATION_INTERVAL_DAYS - (today - lastShownEpochDay));
     }
 
     public void showToast() {
@@ -68,6 +62,8 @@ public void showToast() {
             return;
         }
 
+        preferences.getDonationPreferences().setLastShownEpochDay((int) LocalDate.now().toEpochDay());
+
         Label title = new Label(Localization.lang("Support JabRef"));
         title.getStyleClass().add("donation-toast-title");
         Label subtitle = new Label(Localization.lang("Help us improve JabRef by donating."));
@@ -139,7 +135,8 @@ private void hideToast() {
     private void scheduleAfterDays(int days) {
         cancelScheduled();
         if (days <= 0) {
-            scheduledShow = new DelayedExecution(Duration.millis(1), this::showIfNeeded);
+            showToast();
+            scheduledShow = new DelayedExecution(Duration.millis(DONATION_INTERVAL_DAYS), this::showIfNeeded);
         } else {
             scheduledShow = new DelayedExecution(Duration.hours(days * 24), this::showIfNeeded);
         }
diff --git a/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java b/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
new file mode 100644
index 00000000000..1f5cb808eb3
--- /dev/null
+++ b/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
@@ -0,0 +1,22 @@
+package org.jabref.gui.welcome.components;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class DonationProviderTest {
+    @Test
+    public void testCalculateDaysUntilNextPopup() {
+        DonationProvider donationProvider = new DonationProvider(null, null, null);
+
+        int lastShownEpochDay = (int) LocalDate.now().minusDays(400).toEpochDay();
+        int daysUntilNextPopup = donationProvider.calculateDaysUntilNextPopup(lastShownEpochDay);
+        assertEquals(0, daysUntilNextPopup);
+
+        lastShownEpochDay = (int) LocalDate.now().toEpochDay();
+        daysUntilNextPopup = donationProvider.calculateDaysUntilNextPopup(lastShownEpochDay);
+        assertEquals(365, daysUntilNextPopup);
+    }
+}

From c835d109134c5051c6ce3f9e99c267388a47972e Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Tue, 12 Aug 2025 23:44:21 -0400
Subject: [PATCH 16/22] fix(donation): Applied all the suggested changes

---
 CHANGELOG.md                                  |  4 +--
 .../jabref/gui/search/GlobalSearchBar.java    |  2 +-
 .../main/java/org/jabref/gui/util/URLs.java   |  8 ++++++
 .../gui/walkthrough/WalkthroughAction.java    | 13 +++++----
 .../walkthrough/declarative/NodeResolver.java |  3 +-
 .../org/jabref/gui/welcome/WelcomeTab.java    | 11 ++++++--
 .../welcome/components/DonationProvider.java  | 28 +++++++++++++++++--
 .../preferences/JabRefCliPreferences.java     |  2 +-
 .../logic/search/SearchPreferences.java       | 12 ++++----
 .../main/resources/l10n/JabRef_en.properties  | 12 ++++----
 10 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb02c480695..b41a1d1ba87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,8 +67,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We changed the validation error dialog for overriding the default file directories to a confirmation dialog for saving other preferences under the library properties. [#13488](https://github.com/JabRef/jabref/pull/13488)
 - We improved file exists warning dialog with clearer options and tooltips [#12565](https://github.com/JabRef/jabref/issues/12565)
 - We introduced walkthrough functionality [#12664](https://github.com/JabRef/jabref/issues/12664)
-- We introduced responsive layout in WelcomeTab [#12664](https://github.com/JabRef/jabref/issues/12664)
-- We introduced donation prompt in WelcomeTab [#12664](https://github.com/JabRef/jabref/issues/12664)
+- The Welcome tab now has a responsive layout. [#12664](https://github.com/JabRef/jabref/issues/12664)
+- We introduced a donation prompt in the Welcome tab. [#12664](https://github.com/JabRef/jabref/issues/12664)
 
 ### Fixed
 
diff --git a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 95471f3b520..5f57bc61c51 100644
--- a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -307,7 +307,7 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        keepSearchString.selectedProperty().bindBidirectional(searchPreferences.keepSearchStingProperty());
+        keepSearchString.selectedProperty().bindBidirectional(searchPreferences.keepSearchStringProperty());
         keepSearchString.setTooltip(new Tooltip(Localization.lang("Keep search string across libraries")));
         initSearchModifierButton(keepSearchString);
         keepSearchString.selectedProperty().addListener((_, _, _) -> searchField.requestFocus());
diff --git a/jabgui/src/main/java/org/jabref/gui/util/URLs.java b/jabgui/src/main/java/org/jabref/gui/util/URLs.java
index e00cc65e4c8..bd6069fc465 100644
--- a/jabgui/src/main/java/org/jabref/gui/util/URLs.java
+++ b/jabgui/src/main/java/org/jabref/gui/util/URLs.java
@@ -23,6 +23,14 @@ public class URLs {
     public static final String GROBID_DOC = "https://docs.jabref.org/collect/newentryfromplaintext#grobid";
     public static final String ENTRY_TABLE_COLUMNS_DOC = "https://docs.jabref.org/advanced/main-window";
 
+    // Walkthroughs URLs
+    public static final String GROUPS_DOC = "https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups";
+    public static final String SEARCH_WITH_IN_LIBRARY_DOC = "https://docs.jabref.org/finding-sorting-and-cleaning-entries/search";
+    public static final String MANAGE_ASSOCIATED_FILES_DOC = "https://docs.jabref.org/finding-sorting-and-cleaning-entries/filelinks";
+    public static final String LINK_EXTERNAL_FILE_WALKTHROUGH_EXAMPLE_PDF = "https://nutritionandmetabolism.biomedcentral.com/counter/pdf/10.1186/1743-7075-3-2.pdf";
+    public static final String ADD_PDF_DOC = "https://docs.jabref.org/collect/add-pdfs-to-an-entry";
+    public static final String FIND_UNLINKED_FILES_DOC = "https://docs.jabref.org/collect/findunlinkedfiles";
+    
     // AboutDialogViewModel URLs
     public static final String HOMEPAGE_URL = "https://www.jabref.org";
     public static final String DONATION_URL = "https://donations.jabref.org";
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index 18fef13b42d..6446db7031f 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -17,6 +17,7 @@
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.preferences.PreferencesDialogView;
 import org.jabref.gui.search.GlobalSearchBar;
+import org.jabref.gui.util.URLs;
 import org.jabref.gui.walkthrough.declarative.NodeResolver;
 import org.jabref.gui.walkthrough.declarative.Trigger;
 import org.jabref.gui.walkthrough.declarative.WindowResolver;
@@ -135,7 +136,7 @@ private Walkthrough createCustomizeEntryTableWalkthrough() {
                         .panel(Localization.lang("Click \"Save\" to save changes"))
                         .content(
                                 new TextBlock(Localization.lang("Your entry table columns are now configured. These settings will be applied to all your libraries in JabRef.")),
-                                new InfoBlock(Localization.lang("You can find more information about customizing JabRef at [documentation](https://docs.jabref.org/advanced/main-window)"))
+                                new InfoBlock(Localization.lang("You can find more information about customizing JabRef at [documentation](%0)", URLs.ENTRY_TABLE_COLUMNS_DOC))
                         )
                         .resolver(NodeResolver.selectorWithText(".button", text -> Localization.lang("Save").equals(text)))
                         .trigger(Trigger.onClick())
@@ -275,7 +276,7 @@ private Walkthrough createPdfLinkWalkthrough() {
                         .highlight(HighlightEffect.SPOT_LIGHT))
                 .addStep(WalkthroughStep
                         .tooltip(Localization.lang("Enter URL for download"))
-                        .content(new TextBlock(Localization.lang("Enter the URL of the PDF file you want to download. You can try this example URL: https://nutritionandmetabolism.biomedcentral.com/counter/pdf/10.1186/1743-7075-3-2.pdf")))
+                        .content(new TextBlock(Localization.lang("Enter the URL of the PDF file you want to download. You can try this example URL: %0", URLs.LINK_EXTERNAL_FILE_WALKTHROUGH_EXAMPLE_PDF)))
                         .resolver(NodeResolver.selector(".text-input"))
                         .trigger(Trigger.onTextInput())
                         .activeWindow(WindowResolver.not(stage))
@@ -294,7 +295,7 @@ private Walkthrough createPdfLinkWalkthrough() {
                         .panel(Localization.lang("PDF file linked successfully"))
                         .content(
                                 new TextBlock(Localization.lang("Congratulations. You have successfully linked a PDF file to a bibliography entry. This makes it easy to access your research documents directly from JabRef. You can repeat this process for all your entries.")),
-                                new InfoBlock(Localization.lang("For detailed information: [Adding PDFs](https://docs.jabref.org/collect/add-pdfs-to-an-entry), [Managing files](https://docs.jabref.org/finding-sorting-and-cleaning-entries/filelinks), [Finding unlinked files](https://docs.jabref.org/collect/findunlinkedfiles)."))
+                                new InfoBlock(Localization.lang("For detailed information: [Adding PDFs](%0), [Managing files](%1), [Finding unlinked files](%2).", URLs.ADD_PDF_DOC, URLs.MANAGE_ASSOCIATED_FILES_DOC, URLs.FIND_UNLINKED_FILES_DOC))
                         )
                         .resolver(NodeResolver.predicate(LinkedFilesEditor.class::isInstance))
                         .continueButton(Localization.lang("Finish"))
@@ -431,7 +432,7 @@ private Walkthrough createGroupWalkthrough() {
                         .panel(Localization.lang("Groups walkthrough completed"))
                         .content(
                                 new TextBlock(Localization.lang("You've learned how to create groups and add entries to them. Groups are a powerful way to organize your bibliography and can be nested to create hierarchical structures.")),
-                                new InfoBlock(Localization.lang("For more information about groups: [Groups documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)"))
+                                new InfoBlock(Localization.lang("For more information about groups: [Groups documentation](%0)", URLs.GROUPS_DOC))
                         )
                         .resolver(NodeResolver.predicate(node -> node.getClass().getName().contains("GroupsSidePaneComponent")))
                         .continueButton(Localization.lang("Finish"))
@@ -589,7 +590,7 @@ private Walkthrough createSearchWalkthrough() {
                 .addStep(WalkthroughStep
                         .panel(Localization.lang("Search walkthrough completed"))
                         .content(new TextBlock(Localization.lang("**Quick reference:**\n- Press **Ctrl+F** to jump to search\n- Use **field = value** for field searches\n- Combine with **AND**, **OR**, **NOT**\n- Enable **regex** for pattern matching")),
-                                new InfoBlock(Localization.lang("For complete search documentation and more examples, visit [Search documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/search)")))
+                                new InfoBlock(Localization.lang("For complete search documentation and more examples, visit [Search documentation](%0)", URLs.SEARCH_WITH_IN_LIBRARY_DOC)))
                         .continueButton(Localization.lang("Finish"))
                         .position(PanelPosition.RIGHT)
                         .quitButtonPosition(QuitButtonPosition.BOTTOM_LEFT))
@@ -660,7 +661,7 @@ private Walkthrough createMainFileDirectoryWalkthrough() {
                         .panel(Localization.lang("Click \"Save\" to save changes"))
                         .content(
                                 new TextBlock(Localization.lang("Congratulations. Your main file directory is now configured. JabRef will use this location to automatically find and organize your research documents.")),
-                                new InfoBlock(Localization.lang("Additional information on main file directory can be found in [help](https://docs.jabref.org/v5/finding-sorting-and-cleaning-entries/filelinks)"))
+                                new InfoBlock(Localization.lang("Additional information on main file directory can be found in [Manage Associated Files Documentation](%0)", URLs.MANAGE_ASSOCIATED_FILES_DOC))
                         )
                         .resolver(NodeResolver.selectorWithText(".button", text -> Localization.lang("Save").equals(text)))
                         .trigger(Trigger.onClick())
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
index 0b4948df3a1..afbb454c2c0 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/NodeResolver.java
@@ -44,7 +44,7 @@ static NodeResolver selector(@NonNull String selector) {
     /// Creates a resolver that finds a node by its fx:id.
     ///
     /// @param fxId the fx:id of the node
-    /// @returWn a resolver that finds the node by fx:id
+    /// @return a resolver that finds the node by fx:id
     static NodeResolver fxId(@NonNull String fxId) {
         return scene -> Optional.ofNullable(scene.lookup("#" + fxId));
     }
@@ -54,6 +54,7 @@ static NodeResolver fxId(@NonNull String fxId) {
     /// @param glyph the graphic of the button
     /// @return a resolver that finds the button by graphic
     static NodeResolver buttonWithGraphic(IconTheme.JabRefIcons glyph) {
+        // .icon-button, .button selector is not used, because lookupAll doesn't support multiple selectors
         return scene -> Streams.concat(scene.getRoot().lookupAll(".button").stream(),
                                        scene.getRoot().lookupAll(".icon-button").stream())
                                .filter(node -> {
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index 8d547549eb3..b1d212dbfcd 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -51,6 +51,7 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 
+import org.jspecify.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +77,7 @@ public class WelcomeTab extends Tab {
     private Walkthroughs walkthroughs;
 
     private QuickSettings quickSettings;
+    private final DonationProvider donationProvider;
 
     public WelcomeTab(Stage stage,
                       LibraryTabContainer tabContainer,
@@ -126,8 +128,10 @@ public WelcomeTab(Stage stage,
         StackPane rootPane = new StackPane(container);
         setContent(rootPane);
 
-        DonationProvider donationProvider = new DonationProvider(rootPane, preferences, dialogService);
+        donationProvider = new DonationProvider(rootPane, preferences, dialogService);
         donationProvider.showIfNeeded();
+
+        setOnClosed(_ -> donationProvider.cleanUp());
     }
 
     private VBox createTopTitles() {
@@ -182,7 +186,10 @@ private VBox createRightColumn() {
         return rightColumn;
     }
 
-    private void updateColumnsLayout(GridPane grid, VBox leftColumn, VBox rightColumn, double availableWidth) {
+    private void updateColumnsLayout(@NonNull GridPane grid,
+                                     @NonNull VBox leftColumn,
+                                     @NonNull VBox rightColumn,
+                                     double availableWidth) {
         grid.getChildren().clear();
         grid.getColumnConstraints().clear();
 
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
index ff6f01c4aeb..436b72ed5c6 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
@@ -34,6 +34,7 @@ public class DonationProvider {
     private final DialogService dialogService;
     private HBox donationToast;
     private DelayedExecution scheduledShow;
+    private DelayedExecution autoHide;
 
     public DonationProvider(StackPane rootPane, GuiPreferences preferences, DialogService dialogService) {
         this.rootPane = rootPane;
@@ -115,7 +116,11 @@ public void showToast() {
         slideDown.setToY(0);
         slideDown.play();
 
-        new DelayedExecution(Duration.seconds(DONATION_POPUP_TIMEOUT_SECONDS), this::hideToast).start();
+        if (autoHide != null) {
+            autoHide.cancel();
+        }
+        autoHide = new DelayedExecution(Duration.seconds(DONATION_POPUP_TIMEOUT_SECONDS), this::hideToast);
+        autoHide.start();
     }
 
     private void hideToast() {
@@ -125,7 +130,14 @@ private void hideToast() {
         TranslateTransition slideUp = new TranslateTransition(Duration.millis(DONATION_POPUP_ANIM_MS), donationToast);
         slideUp.setFromY(donationToast.getTranslateY());
         slideUp.setToY(-40);
-        slideUp.setOnFinished(_ -> rootPane.getChildren().remove(donationToast));
+        slideUp.setOnFinished(_ -> {
+            rootPane.getChildren().remove(donationToast);
+            donationToast = null;
+            if (autoHide != null) {
+                autoHide.cancel();
+                autoHide = null;
+            }
+        });
         slideUp.play();
     }
 
@@ -149,6 +161,18 @@ private void cancelScheduled() {
             scheduledShow = null;
         }
     }
+
+    public void cleanUp() {
+        cancelScheduled();
+        if (autoHide != null) {
+            autoHide.cancel();
+            autoHide = null;
+        }
+        if (donationToast != null) {
+            rootPane.getChildren().remove(donationToast);
+            donationToast = null;
+        }
+    }
 }
 
 
diff --git a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 809a55e575e..e4dc2bb0d5d 100644
--- a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -2079,7 +2079,7 @@ public SearchPreferences getSearchPreferences() {
         searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchFlags>) _ ->
                 putBoolean(SEARCH_FULLTEXT, searchPreferences.getObservableSearchFlags().contains(SearchFlags.FULLTEXT)));
         EasyBind.listen(searchPreferences.searchDisplayModeProperty(), (_, _, newValue) -> putBoolean(SEARCH_DISPLAY_MODE, newValue == SearchDisplayMode.FILTER));
-        EasyBind.listen(searchPreferences.keepSearchStingProperty(), (_, _, newValue) -> putBoolean(SEARCH_KEEP_SEARCH_STRING, newValue));
+        EasyBind.listen(searchPreferences.keepSearchStringProperty(), (_, _, newValue) -> putBoolean(SEARCH_KEEP_SEARCH_STRING, newValue));
         EasyBind.listen(searchPreferences.keepWindowOnTopProperty(), (_, _, _) -> putBoolean(SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP, searchPreferences.shouldKeepWindowOnTop()));
         EasyBind.listen(searchPreferences.getSearchWindowHeightProperty(), (_, _, _) -> putDouble(SEARCH_WINDOW_HEIGHT, searchPreferences.getSearchWindowHeight()));
         EasyBind.listen(searchPreferences.getSearchWindowWidthProperty(), (_, _, _) -> putDouble(SEARCH_WINDOW_WIDTH, searchPreferences.getSearchWindowWidth()));
diff --git a/jablib/src/main/java/org/jabref/logic/search/SearchPreferences.java b/jablib/src/main/java/org/jabref/logic/search/SearchPreferences.java
index e75269f53a4..f351cb54fec 100644
--- a/jablib/src/main/java/org/jabref/logic/search/SearchPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/search/SearchPreferences.java
@@ -23,7 +23,7 @@ public class SearchPreferences {
     private final DoubleProperty searchWindowHeight;
     private final DoubleProperty searchWindowWidth;
     private final DoubleProperty searchWindowDividerPosition;
-    private final BooleanProperty keepSearchSting;
+    private final BooleanProperty keepSearchString;
     private final ObjectProperty<SearchDisplayMode> searchDisplayMode;
 
     public SearchPreferences(SearchDisplayMode searchDisplayMode,
@@ -56,7 +56,7 @@ public SearchPreferences(SearchDisplayMode searchDisplayMode, EnumSet<SearchFlag
         this.searchWindowHeight = new SimpleDoubleProperty(searchWindowHeight);
         this.searchWindowWidth = new SimpleDoubleProperty(searchWindowWidth);
         this.searchWindowDividerPosition = new SimpleDoubleProperty(searchWindowDividerPosition);
-        this.keepSearchSting = new SimpleBooleanProperty(keepSearchString);
+        this.keepSearchString = new SimpleBooleanProperty(keepSearchString);
     }
 
     public EnumSet<SearchFlags> getSearchFlags() {
@@ -92,7 +92,7 @@ public boolean isFulltext() {
     }
 
     public boolean shouldKeepSearchString() {
-        return keepSearchSting.get();
+        return keepSearchString.get();
     }
 
     public boolean shouldKeepWindowOnTop() {
@@ -139,8 +139,8 @@ public ObjectProperty<SearchDisplayMode> searchDisplayModeProperty() {
         return this.searchDisplayMode;
     }
 
-    public BooleanProperty keepSearchStingProperty() {
-        return keepSearchSting;
+    public BooleanProperty keepSearchStringProperty() {
+        return keepSearchString;
     }
 
     public void setSearchWindowHeight(double height) {
@@ -160,6 +160,6 @@ public void setSearchDisplayMode(SearchDisplayMode searchDisplayMode) {
     }
 
     public void setKeepSearchString(boolean keepSearchString) {
-        this.keepSearchSting.set(keepSearchString);
+        this.keepSearchString.set(keepSearchString);
     }
 }
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index e1973dde378..b024351b092 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -3010,7 +3010,7 @@ Specify\ "Main\ file\ directory"\ option=Specify "Main file directory" option
 # Step 6
 Click\ "Save"\ to\ save\ changes=Click "Save" to save changes
 Congratulations.\ Your\ main\ file\ directory\ is\ now\ configured.\ JabRef\ will\ use\ this\ location\ to\ automatically\ find\ and\ organize\ your\ research\ documents.=Congratulations. Your main file directory is now configured. JabRef will use this location to automatically find and organize your research documents.
-Additional\ information\ on\ main\ file\ directory\ can\ be\ found\ in\ [help](https\://docs.jabref.org/v5/finding-sorting-and-cleaning-entries/filelinks)=Additional information on main file directory can be found in [help](https://docs.jabref.org/v5/finding-sorting-and-cleaning-entries/filelinks)
+Additional\ information\ on\ main\ file\ directory\ can\ be\ found\ in\ [Manage\ Associated\ Files\ Documentation](%0)=Additional information on main file directory can be found in [Manage Associated Files Documentation](%0)
 
 # Walkthrough: Link PDFs to entries
 # Step 1
@@ -3075,7 +3075,7 @@ Click\ the\ "Download\ from\ URL"\ button\ (third\ button\ with\ a\ download\ ic
 
 # Step 16
 Enter\ URL\ for\ download=Enter URL for download
-Enter\ the\ URL\ of\ the\ PDF\ file\ you\ want\ to\ download.\ You\ can\ try\ this\ example\ URL\:\ https\://nutritionandmetabolism.biomedcentral.com/counter/pdf/10.1186/1743-7075-3-2.pdf=Enter the URL of the PDF file you want to download. You can try this example URL: https://nutritionandmetabolism.biomedcentral.com/counter/pdf/10.1186/1743-7075-3-2.pdf
+Enter\ the\ URL\ of\ the\ PDF\ file\ you\ want\ to\ download.\ You\ can\ try\ this\ example\ URL\:\ %0=Enter the URL of the PDF file you want to download. You can try this example URL: %0
 
 # Step 17
 Confirm\ URL\ download=Confirm URL download
@@ -3084,7 +3084,7 @@ Click\ "OK"\ to\ start\ downloading\ the\ PDF\ from\ the\ entered\ URL.=Click "O
 # Step 18
 PDF\ file\ linked\ successfully=PDF file linked successfully
 Congratulations\.\ You\ have\ successfully\ linked\ a\ PDF\ file\ to\ a\ bibliography\ entry.\ This\ makes\ it\ easy\ to\ access\ your\ research\ documents\ directly\ from\ JabRef.\ You\ can\ repeat\ this\ process\ for\ all\ your\ entries.=Congratulations. You have successfully linked a PDF file to a bibliography entry. This makes it easy to access your research documents directly from JabRef. You can repeat this process for all your entries.
-For\ detailed\ information\:\ [Adding\ PDFs](https\://docs.jabref.org/collect/add-pdfs-to-an-entry),\ [Managing\ files](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/filelinks),\ [Finding\ unlinked\ files](https\://docs.jabref.org/collect/findunlinkedfiles).=For detailed information: [Adding PDFs](https://docs.jabref.org/collect/add-pdfs-to-an-entry), [Managing files](https://docs.jabref.org/finding-sorting-and-cleaning-entries/filelinks), [Finding unlinked files](https://docs.jabref.org/collect/findunlinkedfiles).
+For\ detailed\ information\:\ [Adding\ PDFs](%0),\ [Managing\ files](%1),\ [Finding\ unlinked\ files](%2).=For detailed information: [Adding PDFs](%0), [Managing files](%1), [Finding unlinked files](%2).
 
 # Walkthrough: Entry table walkthrough
 # Step 1-2: Shared with Configure Main File Directory
@@ -3097,7 +3097,7 @@ Here\ you\ can\ customize\ which\ columns\ appear\ in\ your\ entry\ table.\ You\
 The\ columns\ you\ configure\ here\ will\ be\ displayed\ whenever\ you\ open\ a\ library\ in\ JabRef.\ You\ can\ always\ return\ to\ this\ settings\ page\ to\ modify\ your\ column\ preferences.=The columns you configure here will be displayed whenever you open a library in JabRef. You can always return to this settings page to modify your column preferences.
 # Step 5:
 Your\ entry\ table\ columns\ are\ now\ configured.\ These\ settings\ will\ be\ applied\ to\ all\ your\ libraries\ in\ JabRef.=Your entry table columns are now configured. These settings will be applied to all your libraries in JabRef.
-You\ can\ find\ more\ information\ about\ customizing\ JabRef\ at\ [documentation](https\://docs.jabref.org/advanced/main-window)=You can find more information about customizing JabRef at [documentation](https://docs.jabref.org/advanced/main-window)
+You\ can\ find\ more\ information\ about\ customizing\ JabRef\ at\ [documentation](%0)=You can find more information about customizing JabRef at [documentation](%0)
 
 # Walkthrough: Groups
 # Step 2
@@ -3142,7 +3142,7 @@ Click\ on\ \"%0\"\ to\ add\ the\ Corti_2009\ entry\ to\ your\ group.=Click on "%
 # Completion
 Groups\ walkthrough\ completed=Groups walkthrough completed
 You've\ learned\ how\ to\ create\ groups\ and\ add\ entries\ to\ them.\ Groups\ are\ a\ powerful\ way\ to\ organize\ your\ bibliography\ and\ can\ be\ nested\ to\ create\ hierarchical\ structures.=You've learned how to create groups and add entries to them. Groups are a powerful way to organize your bibliography and can be nested to create hierarchical structures.
-For\ more\ information\ about\ groups\:\ [Groups\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)=For more information about groups: [Groups documentation](https://docs.jabref.org/finding-sorting-and-cleaning-entries/groups)
+For\ more\ information\ about\ groups\:\ [Groups\ documentation](%0)=For more information about groups: [Groups documentation](%0)
 
 # Walkthrough: Search
 Search\ your\ library=Search your library
@@ -3216,7 +3216,7 @@ This\ query\ finds\ entries\ with\ capital\ WHO\ only.\ With\ case\ sensitivity\
 # Step 17
 Search\ walkthrough\ completed=Search\ walkthrough\ completed
 **Quick\ reference\:**\n-\ Press\ **Ctrl+F**\ to\ jump\ to\ search\n-\ Use\ **field\ \=\ value**\ for\ field\ searches\n-\ Combine\ with\ **AND**,\ **OR**,\ **NOT**\n-\ Enable\ **regex**\ for\ pattern\ matching=**Quick reference:**\n- Press **Ctrl+F** to jump to search\n- Use **field = value** for field searches\n- Combine with **AND**, **OR**, **NOT**\n- Enable **regex** for pattern matching
-For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/search)=For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](https\://docs.jabref.org/finding-sorting-and-cleaning-entries/search)
+For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](%0)=For\ complete\ search\ documentation\ and\ more\ examples,\ visit\ [Search\ documentation](%0)
 
 # Walkthrough side effects
 Side\ effect\ timeout=Side effect timeout

From a84fc33ccd445ecf0a3e95846d729c9e05ad83f0 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Fri, 15 Aug 2025 14:51:56 -0400
Subject: [PATCH 17/22] test(donation): Apply open rewrite

---
 .../org/jabref/gui/welcome/components/DonationProviderTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java b/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
index 1f5cb808eb3..6c3f6b988f7 100644
--- a/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
+++ b/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
@@ -8,7 +8,7 @@
 
 class DonationProviderTest {
     @Test
-    public void testCalculateDaysUntilNextPopup() {
+    public void calculateDaysUntilNextPopup() {
         DonationProvider donationProvider = new DonationProvider(null, null, null);
 
         int lastShownEpochDay = (int) LocalDate.now().minusDays(400).toEpochDay();

From 28d6c3b216854c1e547093302c9a1e1252194c20 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sat, 16 Aug 2025 12:14:41 -0400
Subject: [PATCH 18/22] test(donation): Use appropriate mock parameters for
 testing

---
 .../gui/welcome/components/DonationProviderTest.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java b/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
index 6c3f6b988f7..c2fd20e8a94 100644
--- a/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
+++ b/jabgui/src/test/java/org/jabref/gui/welcome/components/DonationProviderTest.java
@@ -2,14 +2,20 @@
 
 import java.time.LocalDate;
 
+import javafx.scene.layout.StackPane;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.GuiPreferences;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 class DonationProviderTest {
     @Test
     public void calculateDaysUntilNextPopup() {
-        DonationProvider donationProvider = new DonationProvider(null, null, null);
+        DonationProvider donationProvider = new DonationProvider(new StackPane(), mock(GuiPreferences.class), mock(DialogService.class));
 
         int lastShownEpochDay = (int) LocalDate.now().minusDays(400).toEpochDay();
         int daysUntilNextPopup = donationProvider.calculateDaysUntilNextPopup(lastShownEpochDay);

From dc249d2e8c4b244429f0aac94f93b485e9b2400b Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sat, 16 Aug 2025 12:31:23 -0400
Subject: [PATCH 19/22] fix(donation): Fix imports in GuiPreferences

---
 .../src/main/java/org/jabref/gui/preferences/GuiPreferences.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
index 0b7e2acdf9e..dd134684e73 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/GuiPreferences.java
@@ -19,7 +19,6 @@
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.push.PushToApplicationPreferences;
-import org.jabref.gui.preferences.DonationPreferences;
 
 public interface GuiPreferences extends CliPreferences {
     CopyToPreferences getCopyToPreferences();

From 174f62d49aa5a1f42127ad003f3e24b89e5234ab Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Sat, 16 Aug 2025 15:04:17 -0400
Subject: [PATCH 20/22] style: Remove extra newlines at end of new walkthroughs
 and donations

---
 .../java/org/jabref/gui/preferences/DonationPreferences.java   | 2 --
 .../declarative/sideeffect/EnsureSearchSettingsSideEffect.java | 2 --
 .../org/jabref/gui/welcome/components/DonationProvider.java    | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java
index fa6b3793d70..b4526219b2d 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/DonationPreferences.java
@@ -38,5 +38,3 @@ public IntegerProperty lastShownEpochDayProperty() {
         return lastShownEpochDay;
     }
 }
-
-
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
index 7d2c4749c45..f3df1e4be94 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
@@ -51,5 +51,3 @@ public boolean backward(@NonNull Walkthrough walkthrough) {
         return Localization.lang("Prepare search settings");
     }
 }
-
-
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
index 436b72ed5c6..f5c75b90ea2 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/DonationProvider.java
@@ -174,6 +174,3 @@ public void cleanUp() {
         }
     }
 }
-
-
-

From b55db2267d879a0156348a92f341ffc8b08ee8b5 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Thu, 21 Aug 2025 10:37:39 -0400
Subject: [PATCH 21/22] fix: update according to Subhramit and Carl's
 suggestion

---
 .../gui/preferences/JabRefGuiPreferences.java | 13 ++++++---
 .../gui/walkthrough/WalkthroughAction.java    |  7 +++--
 .../EnsureSearchSettingsSideEffect.java       | 28 +++++++++----------
 .../org/jabref/gui/welcome/WelcomeTab.java    |  2 +-
 .../gui/welcome/components/Walkthroughs.java  |  7 +++--
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java b/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
index 703952b7f66..e91f4d6bd62 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java
@@ -241,6 +241,7 @@ public class JabRefGuiPreferences extends JabRefCliPreferences implements GuiPre
     private KeyBindingRepository keyBindingRepository;
     private CopyToPreferences copyToPreferences;
     private NewEntryPreferences newEntryPreferences;
+    private DonationPreferences donationPreferences;
 
     private JabRefGuiPreferences() {
         super();
@@ -1203,10 +1204,14 @@ public NewEntryPreferences getNewEntryPreferences() {
     }
 
     public DonationPreferences getDonationPreferences() {
-        DonationPreferences dp = new DonationPreferences(getBoolean(DONATION_NEVER_SHOW), getInt(DONATION_LAST_SHOWN_EPOCH_DAY));
-        EasyBind.listen(dp.neverShowAgainProperty(), (_, _, nv) -> putBoolean(DONATION_NEVER_SHOW, nv));
-        EasyBind.listen(dp.lastShownEpochDayProperty(), (_, _, nv) -> putInt(DONATION_LAST_SHOWN_EPOCH_DAY, nv.intValue()));
-        return dp;
+        if (donationPreferences != null) {
+            return donationPreferences;
+        }
+
+        donationPreferences = new DonationPreferences(getBoolean(DONATION_NEVER_SHOW), getInt(DONATION_LAST_SHOWN_EPOCH_DAY));
+        EasyBind.listen(donationPreferences.neverShowAgainProperty(), (_, _, newValue) -> putBoolean(DONATION_NEVER_SHOW, newValue));
+        EasyBind.listen(donationPreferences.lastShownEpochDayProperty(), (_, _, newValue) -> putInt(DONATION_LAST_SHOWN_EPOCH_DAY, newValue.intValue()));
+        return donationPreferences;
     }
 
     /**
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
index 6446db7031f..23f66ed579a 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/WalkthroughAction.java
@@ -15,6 +15,7 @@
 import org.jabref.gui.fieldeditors.LinkedFilesEditor;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.MainTable;
+import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.preferences.PreferencesDialogView;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.util.URLs;
@@ -49,11 +50,13 @@ public class WalkthroughAction extends SimpleCommand {
     private final LibraryTabContainer frame;
     private final StateManager stateManager;
     private final Stage stage;
+    private final GuiPreferences preferences;
 
-    public WalkthroughAction(Stage stage, LibraryTabContainer frame, StateManager stateManager, String name) {
+    public WalkthroughAction(Stage stage, LibraryTabContainer frame, StateManager stateManager, GuiPreferences preferences, String name) {
         this.stage = stage;
         this.frame = frame;
         this.stateManager = stateManager;
+        this.preferences = preferences;
         this.walkthrough = getWalkthrough(name);
     }
 
@@ -456,7 +459,7 @@ private Walkthrough createSearchWalkthrough() {
                                         .sideEffect(new OpenLibrarySideEffect(frame, "SearchExamples.bib")))
                 // Step 1b: Ensure initial search settings
                 .addStep(WalkthroughStep.sideEffect(Localization.lang("Prepare search settings"))
-                                        .sideEffect(new EnsureSearchSettingsSideEffect()))
+                                        .sideEffect(new EnsureSearchSettingsSideEffect(preferences.getSearchPreferences())))
                 // Step 2: Introduction
                 .addStep(WalkthroughStep
                         .panel(Localization.lang("Welcome to the search walkthrough"))
diff --git a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
index f3df1e4be94..fdbe287bbb8 100644
--- a/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
+++ b/jabgui/src/main/java/org/jabref/gui/walkthrough/declarative/sideeffect/EnsureSearchSettingsSideEffect.java
@@ -1,12 +1,11 @@
 package org.jabref.gui.walkthrough.declarative.sideeffect;
 
-import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.walkthrough.Walkthrough;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.search.SearchDisplayMode;
 import org.jabref.model.search.SearchFlags;
 
-import com.airhacks.afterburner.injection.Injector;
 import org.jspecify.annotations.NonNull;
 
 /// Ensures the search bar starts with unfiltered mode and regex disabled, then restores
@@ -15,12 +14,13 @@ public class EnsureSearchSettingsSideEffect implements WalkthroughSideEffect {
     private final boolean previousRegex;
     private final boolean previousCaseSensitive;
     private final SearchDisplayMode previousDisplayMode;
+    private final SearchPreferences searchPreferences;
 
-    public EnsureSearchSettingsSideEffect() {
-        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
-        this.previousRegex = preferences.isRegularExpression();
-        this.previousCaseSensitive = preferences.isCaseSensitive();
-        this.previousDisplayMode = preferences.getSearchDisplayMode();
+    public EnsureSearchSettingsSideEffect(SearchPreferences searchPreferences) {
+        this.searchPreferences = searchPreferences;
+        this.previousRegex = searchPreferences.isRegularExpression();
+        this.previousCaseSensitive = searchPreferences.isCaseSensitive();
+        this.previousDisplayMode = searchPreferences.getSearchDisplayMode();
     }
 
     @Override
@@ -30,19 +30,17 @@ public EnsureSearchSettingsSideEffect() {
 
     @Override
     public boolean forward(@NonNull Walkthrough walkthrough) {
-        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
-        preferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, false);
-        preferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, false);
-        preferences.setSearchDisplayMode(SearchDisplayMode.FLOAT);
+        searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, false);
+        searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, false);
+        searchPreferences.setSearchDisplayMode(SearchDisplayMode.FLOAT);
         return true;
     }
 
     @Override
     public boolean backward(@NonNull Walkthrough walkthrough) {
-        var preferences = Injector.instantiateModelOrService(GuiPreferences.class).getSearchPreferences();
-        preferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, previousRegex);
-        preferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, previousCaseSensitive);
-        preferences.setSearchDisplayMode(previousDisplayMode);
+        searchPreferences.setSearchFlag(SearchFlags.REGULAR_EXPRESSION, previousRegex);
+        searchPreferences.setSearchFlag(SearchFlags.CASE_SENSITIVE, previousCaseSensitive);
+        searchPreferences.setSearchDisplayMode(previousDisplayMode);
         return true;
     }
 
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
index b1d212dbfcd..51bcd11c32b 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/WelcomeTab.java
@@ -178,7 +178,7 @@ private VBox createLeftColumn() {
 
     private VBox createRightColumn() {
         this.quickSettings = new QuickSettings(preferences, dialogService, taskExecutor, themeManager);
-        this.walkthroughs = new Walkthroughs(stage, tabContainer, stateManager);
+        this.walkthroughs = new Walkthroughs(stage, tabContainer, stateManager, preferences);
         VBox rightColumn = new VBox(quickSettings, walkthroughs);
         rightColumn.getStyleClass().add("welcome-content-column");
         VBox.setVgrow(quickSettings, Priority.ALWAYS);
diff --git a/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java b/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
index 6a45cb04a3f..76067aec797 100644
--- a/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
+++ b/jabgui/src/main/java/org/jabref/gui/welcome/components/Walkthroughs.java
@@ -9,6 +9,7 @@
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.GuiPreferences;
 import org.jabref.gui.walkthrough.WalkthroughAction;
 import org.jabref.logic.l10n.Localization;
 
@@ -16,14 +17,16 @@ public class Walkthroughs extends VBox {
     private final Stage stage;
     private final LibraryTabContainer tabContainer;
     private final StateManager stateManager;
+    private final GuiPreferences preferences;
 
     private final Label header;
     private boolean isScrollEnabled = true;
 
-    public Walkthroughs(Stage stage, LibraryTabContainer tabContainer, StateManager stateManager) {
+    public Walkthroughs(Stage stage, LibraryTabContainer tabContainer, StateManager stateManager, GuiPreferences preferences) {
         this.stage = stage;
         this.tabContainer = tabContainer;
         this.stateManager = stateManager;
+        this.preferences = preferences;
 
         getStyleClass().add("welcome-section");
 
@@ -98,7 +101,7 @@ private Button createWalkthroughButton(String text, IconTheme.JabRefIcons icon,
         button.setGraphic(icon.getGraphicNode());
         button.getStyleClass().add("quick-settings-button");
         button.setMaxWidth(Double.MAX_VALUE);
-        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, walkthroughId).execute());
+        button.setOnAction(_ -> new WalkthroughAction(stage, tabContainer, stateManager, preferences, walkthroughId).execute());
         return button;
     }
 }

From f8f48afcae9760adfcb1a9e5c11b629555cc91b8 Mon Sep 17 00:00:00 2001
From: Yubo-Cao <cao2006721@gmail.com>
Date: Fri, 22 Aug 2025 10:51:57 -0400
Subject: [PATCH 22/22] fix: fix the GlobalSearchBarTest

---
 .../main/java/org/jabref/gui/search/GlobalSearchBar.java  | 8 ++++++--
 .../java/org/jabref/gui/search/GlobalSearchBarTest.java   | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 5f57bc61c51..e53d00a8735 100644
--- a/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/jabgui/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -307,10 +307,14 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        keepSearchString.selectedProperty().bindBidirectional(searchPreferences.keepSearchStringProperty());
+        keepSearchString.setSelected(searchPreferences.shouldKeepSearchString());
         keepSearchString.setTooltip(new Tooltip(Localization.lang("Keep search string across libraries")));
         initSearchModifierButton(keepSearchString);
-        keepSearchString.selectedProperty().addListener((_, _, _) -> searchField.requestFocus());
+        searchPreferences.keepSearchStringProperty().addListener((_, _, newVal) -> keepSearchString.setSelected(newVal));
+        keepSearchString.selectedProperty().addListener((_, _, newVal) -> {
+            searchPreferences.setKeepSearchString(newVal);
+            searchField.requestFocus();
+        });
 
         filterModeButton.setSelected(searchPreferences.getSearchDisplayMode() == SearchDisplayMode.FILTER);
         filterModeButton.setTooltip(new Tooltip(Localization.lang("Filter search results")));
diff --git a/jabgui/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/jabgui/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
index cab9432126f..059c42514d6 100644
--- a/jabgui/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
+++ b/jabgui/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -3,6 +3,8 @@
 import java.util.EnumSet;
 import java.util.List;
 
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.scene.Scene;
 import javafx.scene.control.TextInputControl;
@@ -19,6 +21,7 @@
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.search.SearchPreferences;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.search.SearchDisplayMode;
 import org.jabref.model.search.SearchFlags;
 
 import org.junit.jupiter.api.Test;
@@ -46,6 +49,8 @@ public void onStart(Stage stage) {
         SearchPreferences searchPreferences = mock(SearchPreferences.class);
         when(searchPreferences.getSearchFlags()).thenReturn(EnumSet.noneOf(SearchFlags.class));
         when(searchPreferences.getObservableSearchFlags()).thenReturn(FXCollections.observableSet());
+        when(searchPreferences.keepSearchStringProperty()).thenReturn(new SimpleBooleanProperty(false));
+        when(searchPreferences.searchDisplayModeProperty()).thenReturn(new SimpleObjectProperty<>(SearchDisplayMode.FLOAT));
         GuiPreferences preferences = mock(GuiPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getSearchPreferences()).thenReturn(searchPreferences);