diff --git a/Doxyfile b/Doxyfile
index 430bbab34..b165fe030 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -54,7 +54,7 @@ PROJECT_NUMBER = $(COCKATRICE_REF)
# for a project that appears at the top of each page and should give viewers a
# quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF = "A cross-platform virtual tabletop for multiplayer card games"
+PROJECT_BRIEF = "A virtual tabletop for multiplayer card games"
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
# in the documentation. The maximum height of the logo should not exceed 55
@@ -1432,8 +1432,9 @@ HTML_STYLESHEET =
# documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_STYLESHEET = doc/doxygen/theme/doxygen-awesome.css
- doc/doxygen/css/hide_nav_sync.css
+HTML_EXTRA_STYLESHEET = doc/doxygen/theme/doxygen-awesome.css \
+ doc/doxygen/css/hide_nav_sync.css \
+ doc/doxygen/css/cockatrice_docs_style.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
diff --git a/cockatrice/resources/help/deck_search.md b/cockatrice/resources/help/deck_search.md
index c42e41c42..82f7ee044 100644
--- a/cockatrice/resources/help/deck_search.md
+++ b/cockatrice/resources/help/deck_search.md
@@ -1,11 +1,13 @@
@page deck_search_syntax_help Deck Search Syntax Help
## Deck Search Syntax Help
------
+
The search bar recognizes a set of special commands.
In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all
searches are case insensitive.
+
+
- Display Name (The deck name, or the filename if the deck name isn't set):
- [red deck wins](#red deck wins) (Any deck with a display name containing the words red, deck, and wins)
- ["red deck wins"](#%22red deck wins%22) (Any deck with a display name containing the exact phrase "red deck wins")
@@ -42,4 +44,4 @@ searches are case insensitive.
- Grouping:
- red -([[]]:100 or aggro) (Any deck that has red in its filename but is not 100 cards or has aggro in its filename)
-
+
\ No newline at end of file
diff --git a/cockatrice/resources/help/search.md b/cockatrice/resources/help/search.md
index 3b3f0cc93..63e6e74c3 100644
--- a/cockatrice/resources/help/search.md
+++ b/cockatrice/resources/help/search.md
@@ -1,10 +1,12 @@
@page search_syntax_help Search Syntax Help
## Search Syntax Help
------
+
The search bar recognizes a set of special commands similar to some other card databases.
In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
+
+
- Name:
- [birds of paradise](#birds of paradise) (Any card name containing the words birds, of, and paradise)
- ["birds of paradise"](#%22birds of paradise%22) (Any card name containing the exact phrase "birds of paradise")
@@ -65,4 +67,4 @@ In this list of examples below, each entry has an explanation and can be clicked
- [o:/counter target .* spell/](#o:/counter target .* spell/) (Any card text with "counter target *something* spell")
- [o:/for each .* and\/or .*/](#o:/for each .* and\/or .*/) (/'s can be escaped with a \)
-
+
\ No newline at end of file
diff --git a/doc/doxygen/css/cockatrice_docs_style.css b/doc/doxygen/css/cockatrice_docs_style.css
new file mode 100644
index 000000000..e0177bdbb
--- /dev/null
+++ b/doc/doxygen/css/cockatrice_docs_style.css
@@ -0,0 +1,33 @@
+/*
+
+See "Awesome Doxygen CSS" theme docs:
+https://jothepro.github.io/doxygen-awesome-css/md_docs_2customization.html#autotoc_md36
+
+Adjustments here are based on the css file of the theme and variables defined there.
+
+*/
+
+
+/* Light Mode overrides */
+html {
+ --primary-color: #33a946;
+ --primary-dark-color: #33a946;
+ --primary-light-color: #33a946;
+}
+
+/* Dark Mode overrides */
+@media (prefers-color-scheme: dark) {
+ html:not(.light-mode) {
+ --primary-color: #33a946;
+ --primary-dark-color: #33a946;
+ --primary-light-color: #33a946;
+ }
+}
+
+/* Dark Mode overrides, defined twice to support both the dark-mode without and with doxygen-awesome-darkmode-toggle.js */
+html.dark-mode {
+ color-scheme: dark;
+ --primary-color: #33a946;
+ --primary-dark-color: #33a946;
+ --primary-light-color: #33a946;
+}
diff --git a/doc/doxygen/css/doxygen_style.css b/doc/doxygen/css/doxygen_style_old.css
similarity index 100%
rename from doc/doxygen/css/doxygen_style.css
rename to doc/doxygen/css/doxygen_style_old.css
diff --git a/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md b/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
index 1de6fda4f..7b4bdafc3 100644
--- a/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
+++ b/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
@@ -1,3 +1,16 @@
@page card_database_schema_and_parsing Card Database Schema and Parsing
+# Card Database Schemas
+
+Cockatrice uses `XML files` to store information of available cards to be used in the app (`cards.xml`).
+The token file follows the schema of the card database (`tokens.xml`), too.
+
+Saved decks (`.xml`) use a different schema.
+
+- [XSD Schema for `Card Databases`](https://github.com/Cockatrice/Cockatrice/blob/master/doc/carddatabase_v4/cards.xsd) v4
+- [XSD Schema for `Decks`](https://github.com/Cockatrice/Cockatrice/blob/master/doc/deck.xsd) v1
+
+
+# Card Database Parsing
+
TODO
diff --git a/doc/doxygen/extra-pages/index.md b/doc/doxygen/extra-pages/index.md
index c370a6fc2..b3363d3f4 100644
--- a/doc/doxygen/extra-pages/index.md
+++ b/doc/doxygen/extra-pages/index.md
@@ -1,10 +1,8 @@
-@mainpage Cockatrice Documentation
+@mainpage Documentation
-# Welcome
+Welcome to the Cockatrice code documentation.
-This is the **main landing page** of the Cockatrice documentation.
+- @subpage user_reference
+- @subpage developer_reference
-- Go to the @subpage user_reference page
-- Review the @subpage developer_reference
-
-Or check out the [Cockatrice Webpage](https://cockatrice.github.io/).
+Please also check the Cockatrice Webpage or our Code Repository for general information.
diff --git a/doc/doxygen/extra-pages/user_documentation/index.md b/doc/doxygen/extra-pages/user_documentation/index.md
index 33104991a..3f10a0ac6 100644
--- a/doc/doxygen/extra-pages/user_documentation/index.md
+++ b/doc/doxygen/extra-pages/user_documentation/index.md
@@ -1,9 +1,17 @@
@page user_reference User Reference
-
-- @subpage search_syntax_help
-- @subpage deck_search_syntax_help
+## Deck Management
+
- @subpage creating_decks
- @subpage importing_decks
- @subpage editing_decks
- @subpage exporting_decks
+
+## Release Channels
+
+- @subpage beta_release
+
+## Syntax Help
+
+- @subpage search_syntax_help
+- @subpage deck_search_syntax_help