diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ac4642ec..c48af03c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,15 +12,17 @@ v2.0 maintenance release.
 
 ### Detailed list of changes
 
+* Added an experimental theme downloader
 * Added scrollable text container support to the system view
 * Added "Shortcut or script" as an alternative emulator for the arcade and mame systems
 * (Unix) Added the .desktop and .sh file extensions to the arcade and mame systems
 * (macOS) Added the .app and .sh file extensions to the arcade and mame systems
 * (Windows) Added the .bat and .lnk file extensions to the arcade and mame systems
-* Added the .app file extensions to the nds system (for DSiWare games)
+* Added the .app file extensions to the nds system
 * Any theme directories with names ending with "disabled" (regardless of case) are now ignored
-* Added support for changing the BusyComponent text dynamically
 * Added the libgit2 library as a dependency
+* Added support for changing the BusyComponent text dynamically
+* Added proper helpsystem handling to ComponentGrid for some previously unhandled horizontal grid layouts
 
 ### Bug fixes
 
@@ -29,6 +31,7 @@ v2.0 maintenance release.
 * Fixed a potential container overflow in ViewController that could lead to rare crashes when running on an ARM processor
 * (macOS) When opening the main menu an error message was logged about accessing a nonexistent ShowQuitMenu setting
 * The scissor box size in ScrollableContainer was sometimes not calculated correctly
+* FileSystemUtil::renameFile() did sometimes not provide a return value for whether it succeeded or not
 
 ## Version 2.0.0
 
diff --git a/CREDITS.md b/CREDITS.md
index 2df094039..d9c86abd4 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -44,6 +44,9 @@ http://glew.sourceforge.net
 GLM \
 https://github.com/g-truc/glm
 
+libgit2 \
+https://libgit2.org
+
 libvpx \
 https://github.com/webmproject/libvpx
 
diff --git a/README.md b/README.md
index 5fc4d2e6d..aa8441ecf 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 EmulationStation Desktop Edition is a frontend for browsing and launching games from your multi-platform game collection.
 
-Web site:\
+Website:\
 [https://es-de.org](https://es-de.org)
 
 Discord server:\
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 3c4b6ac82..a1f7aff4f 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -373,7 +373,7 @@ Running at a lower application resolution in padded fullscreen mode:
 emulationstation --resolution 1824 1026 --fullscreen-padding 1
 ```
 
-Same as above but also offsetting the screen slighty to the left and downwards:
+Same as above but also offsetting the screen slightly to the left and downwards:
 ```
 emulationstation --resolution 1824 1026 --fullscreen-padding 1 --screenoffset -40 22
 ```
diff --git a/USERGUIDE.md b/USERGUIDE.md
index d678462ec..9ce269f39 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -371,7 +371,7 @@ Running at a lower application resolution in padded fullscreen mode:
 emulationstation --resolution 1824 1026 --fullscreen-padding 1
 ```
 
-Same as above but also offsetting the screen slighty to the left and downwards:
+Same as above but also offsetting the screen slightly to the left and downwards:
 ```
 emulationstation --resolution 1824 1026 --fullscreen-padding 1 --screenoffset -40 22
 ```
diff --git a/images/es-de_theme_downloader.png b/images/es-de_theme_downloader.png
new file mode 100644
index 000000000..6091a62fa
Binary files /dev/null and b/images/es-de_theme_downloader.png differ