diff --git a/README.md b/README.md
index 4bcc87c6..811e9970 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Follow our easy [step by step guide](https://sourcethemes.com/academic/docs/inst
 - Support development of Academic:
   - [Donate a coffee](https://paypal.me/cushen)
   - [Decorate your laptop or journal with an Academic sticker](https://www.redbubble.com/people/neutreno/works/34387919-academic)
+  - [Wear the T-shirt](https://academic.threadless.com/)
 
 [![Screenshot](https://raw.githubusercontent.com/gcushen/hugo-academic/master/academic.png)](https://github.com/gcushen/hugo-academic/)
 
@@ -30,13 +31,17 @@ Follow our easy [step by step guide](https://sourcethemes.com/academic/docs/inst
 
 Academic is available in different color themes and font themes.
 
-| `default` | `ocean` | `dark` |
-| --- | --- | --- |
-| ![default theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-default.png) | ![ocean theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-ocean.png) | ![dark theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-dark.png) |
+| `default` | `ocean` | `forest` | `dark` |
+| --- | --- | --- | --- |
+| ![default theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-default.png) | ![ocean theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-ocean.png) | ![forest theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-forest.png) | ![dark theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-dark.png) |
 
-| `forest` | `coffee` + `playfair` font | `1950s` |
-| --- | --- | --- |
-| ![forest theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-forest.png) | ![coffee theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-coffee-playfair.png) | ![1950s theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-1950s.png) |
+| `apogee` | `1950s` | `coffee` | `cupcake` |
+| --- | --- | --- | --- |
+| ![apogee theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-apogee.png) | ![1950s theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-1950s.png) | ![coffee theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-coffee-playfair.png) | ![cupcake theme](https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-cupcake.png) |
+
+## Ecosystem
+
+**[Academic Admin](https://github.com/sourcethemes/academic-admin):** An admin tool to import publications from BibTeX or import assets for an offline site
 
 ## Install
 
diff --git a/data/themes/apogee.toml b/data/themes/apogee.toml
new file mode 100644
index 00000000..9521877a
--- /dev/null
+++ b/data/themes/apogee.toml
@@ -0,0 +1,20 @@
+# Theme metadata
+name = "Apogee"
+
+# Is theme light or dark?
+light = false
+
+# Primary
+primary = "#EAF04E"
+primary_light = "#F8FD74"
+primary_dark = "#D7DE26"
+
+# Menu
+menu_primary = "#312450"
+menu_text = "#F2BE4E"
+menu_text_active = "#FFE1A0"
+menu_title = "#E0A526"
+
+# Home sections
+home_section_odd = "#5e42a6"
+home_section_even = "#5e42a6"
diff --git a/data/themes/cupcake.toml b/data/themes/cupcake.toml
new file mode 100644
index 00000000..050ad4cb
--- /dev/null
+++ b/data/themes/cupcake.toml
@@ -0,0 +1,20 @@
+# Theme metadata
+name = "Cupcake"
+
+# Is theme light or dark?
+light = true
+
+# Primary
+primary = "#EC407A"
+primary_light = "#F793B5"
+primary_dark = "#CD0045"
+
+# Menu
+menu_primary = "#BE37C7"
+menu_text = "#FFB298"
+menu_text_active = "#fff"
+menu_title = "#FFB298"
+
+# Home sections
+home_section_odd = "#FFB298"
+home_section_even = "#FFB298"
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 99228c38..e7c4b4a9 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -98,7 +98,7 @@ enableGitInfo = false
   # SITE SETUP
 
   # Color theme.
-  #   Choose from `default`, `ocean`, `forest`, `coffee`, `dark`, or `1950s`.
+  #   Choose from `default`, `ocean`, `forest`, `dark`, `apogee`, `1950s`, `coffee`, `cupcake`.
   color_theme = "default"
 
   # Font style.
diff --git a/exampleSite/content/post/getting-started/index.md b/exampleSite/content/post/getting-started/index.md
index 20964a5f..a9195abf 100644
--- a/exampleSite/content/post/getting-started/index.md
+++ b/exampleSite/content/post/getting-started/index.md
@@ -32,6 +32,11 @@ album = "1"
 image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-ocean.png"
 caption = "Ocean"
 
+[[gallery_item]]
+album = "1"
+image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-forest.png"
+caption = "Forest"
+
 [[gallery_item]]
 album = "1"
 image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-dark.png"
@@ -39,8 +44,13 @@ caption = "Dark"
 
 [[gallery_item]]
 album = "1"
-image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-forest.png"
-caption = "Default"
+image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-apogee.png"
+caption = "Apogee"
+
+[[gallery_item]]
+album = "1"
+image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-1950s.png"
+caption = "1950s"
 
 [[gallery_item]]
 album = "1"
@@ -49,8 +59,8 @@ caption = "Coffee theme with Playfair font"
 
 [[gallery_item]]
 album = "1"
-image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-1950s.png"
-caption = "1950s"
+image = "https://raw.githubusercontent.com/gcushen/hugo-academic/master/images/theme-cupcake.png"
+caption = "Cupcake"
 +++
 
 **Academic** makes it easy to create a beautiful website for free using Markdown. Customize anything on your site with widgets, themes, and language packs.
@@ -84,6 +94,10 @@ Academic is available in different color themes and font themes.
 
 {{< gallery >}}
 
+## Ecosystem
+
+**[Academic Admin](https://github.com/sourcethemes/academic-admin):** An admin tool to import publications from BibTeX or import assets for an offline site
+
 ## Install
 
 You can choose from one of the following four methods to install:
diff --git a/images/theme-apogee.png b/images/theme-apogee.png
new file mode 100644
index 00000000..635754c1
Binary files /dev/null and b/images/theme-apogee.png differ
diff --git a/images/theme-cupcake.png b/images/theme-cupcake.png
new file mode 100644
index 00000000..deb94be5
Binary files /dev/null and b/images/theme-cupcake.png differ
diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css
index 17ab4f85..550c9dcb 100644
--- a/layouts/partials/css/academic.css
+++ b/layouts/partials/css/academic.css
@@ -629,6 +629,10 @@ ul.share li i {
   color: #fff;
 }
 
+.dark ul.share li i {
+  color: rgb(68, 71, 90);
+}
+
 ul.share li a {
   background-color: #b5c6ce;
   display: block;
@@ -1284,12 +1288,22 @@ a.badge:hover {
   border-color: {{ .Get "primary" }};
 }
 
+.dark .btn-outline-primary:not(:disabled):not(.disabled).active,
+.dark .btn-outline-primary:not(:disabled):not(.disabled):active,
+.dark .show > .btn-outline-primary.dropdown-toggle {
+  color: rgb(68, 71, 90);
+}
+
 .btn-outline-primary:hover {
   color: #fff;
   background-color: {{ .Get "primary" }};
   border-color: {{ .Get "primary" }};
 }
 
+.dark .btn-outline-primary:hover {
+  color: rgb(68, 71, 90);
+}
+
 /*************************************************
  *  Toolbar Buttons
  **************************************************/
@@ -1438,7 +1452,6 @@ nav#navbar-main li.nav-item {
 }
 
 .navbar-light .navbar-brand {
-  text-transform: uppercase;
   font-weight: bold;
   font-size: 1.2em;
   color: {{ .Get "menu_title" }};
@@ -1898,10 +1911,15 @@ body.dark,
 .dark .docs-sidebar .nav > li:not(.active) > a,
 .dark .modal button.close,
 .dark input,
+.dark .form-control,
 .dark .form-control:focus {
   color: rgb(248, 248, 242);
 }
 
+.dark .form-control {
+  background-color: rgb(68, 71, 90);
+}
+
 .dark .form-control:focus {
   background-color: rgb(68, 71, 90);
   border-color: {{ .Get "primary" }};
@@ -2035,3 +2053,8 @@ body.dark,
 .dark a.badge:hover {
   color: rgba(255, 255, 255, .68);
 }
+
+.dark .btn-primary,
+.dark .btn.btn-primary.active {
+  color: initial;
+}