diff --git a/INSTALL.md b/INSTALL.md
index becba04d1..684ae422c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -269,6 +269,7 @@ The following packages are not readily available for Windows, so clone the repos
 git clone git://git.savannah.gnu.org/freetype/freetype2.git
 git checkout VER-2-10-2
 mkdir build
+cd build
 cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON ..
 make
 ```
@@ -276,6 +277,7 @@ make
 [pugixml](https://pugixml.org)
 ```
 git clone git://github.com/zeux/pugixml
+cd pugixml
 git checkout v1.10
 cmake -G "MinGW Makefiles" -DBUILD_SHARED_LIBS=ON .
 make
@@ -286,6 +288,7 @@ As for RapidJSON, you don't need to compile it, you just need the include files:
 [RapidJSON](http://rapidjson.org)
 ```
 git clone git://github.com/Tencent/rapidjson
+cd rapidjson
 git checkout v1.1.0
 ```
 
diff --git a/USERGUIDE.md b/USERGUIDE.md
index e33a13fc7..e164944bb 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -961,6 +961,11 @@ There are numerous locations throughout ES where custom scripts will be executed
 The setup for this is a bit technical, so please refer to the [INSTALL.md](INSTALL.md) document to see how it's configured.
 
 
+## Portable installation (Windows only)
+
+On Windows, ES can be installed to and run from a removable media device such as a USB memory stick. Together with games and emulators this makes for a fully portable retro gaming solution. The setup is somewhat technical, please refer to the [INSTALL.md](INSTALL.md) document to see how it's configured.
+
+
 ## Command line arguments
 
 You can use **--help** or **-h** to view a list of command line options, as shown here.
@@ -1032,10 +1037,10 @@ Sometimes the name of the console is (more or less) the same for multiple region
 | :-------------------- | :-------------------------------------------- | :----------------------------------- |
 | 3do                   | 3DO                                           |                                      |
 | ags                   | Adventure Game Studio                         |                                      |
-| amiga                 | Amiga                                         | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
-| amiga600              | Amiga 600                                     | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
-| amiga1200             | Amiga 1200                                    | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
-| amigacd32             | Amiga CD32                                    |                                      |
+| amiga                 | Commodore Amiga                               | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
+| amiga600              | Commodore Amiga 600                           | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
+| amiga1200             | Commodore Amiga 1200                          | WHDLoad hard disk image in .hdf or .hdz format, or diskette image in .adf format (with .m3u playlist if multi-disk) |
+| amigacd32             | Commodore Amiga CD32                          |                                      |
 | amstradcpc            | Amstrad CPC                                   |                                      |
 | apple2                | Apple II                                      |                                      |
 | apple2gs              | Apple IIGS                                    |                                      |
@@ -1050,7 +1055,7 @@ Sometimes the name of the console is (more or less) the same for multiple region
 | atarilynx             | Atari Lynx                                    |                                      |
 | atarist               | Atari ST                                      |                                      |
 | atarixe               | Atari XE                                      |                                      |
-| atomiswave            |                                               |                                      |
+| atomiswave            | Atomiswave                                    |                                      |
 | bbcmicro              | BBC Micro                                     |                                      |
 | c64                   | Commodore 64                                  | Single disk, tape or cartridge image in root folder and/or multi-disk images in separate folder |
 | cavestory             | Cave Story (NXEngine)                         |                                      |
@@ -1067,13 +1072,13 @@ Sometimes the name of the console is (more or less) the same for multiple region
 | famicom               | Nintendo Family Computer                      | Single archive or ROM file in root folder |
 | fba                   | Final Burn Alpha                              | Single archive file following MAME name standard |
 | fbneo                 | FinalBurn Neo                                 | Single archive file following MAME name standard |
-| fds                   | Famicom Disk System                           |                                      |
+| fds                   | Nintendo Famicom Disk System                  |                                      |
 | gameandwatch          | Nintendo Game and Watch                       |                                      |
-| gamegear              | Sega Gamegear                                 |                                      |
+| gamegear              | Sega Game Gear                                |                                      |
 | gamecube              | Nintendo GameCube                             |                                      |
-| gb                    | Game Boy                                      |                                      |
-| gba                   | Game Boy Advance                              |                                      |
-| gbc                   | Game Boy Color                                |                                      |
+| gb                    | Nintendo Game Boy                             |                                      |
+| gba                   | Nintendo Game Boy Advance                     |                                      |
+| gbc                   | Nintendo Game Boy Color                       |                                      |
 | genesis               | Sega Genesis                                  | Single archive or ROM file in root folder |
 | gx4000                | Amstrad GX4000                                |                                      |
 | intellivision         | Mattel Electronics Intellivision              |                                      |
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 61e9c69f5..b7fca1e20 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -345,7 +345,7 @@
   </system>
   <system>
     <name>fds</name>
-    <fullname>Famicom Disk System</fullname>
+    <fullname>Nintendo Famicom Disk System</fullname>
     <path>%ROMPATH%/fds</path>
     <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/nestopia_libretro.so %ROM%</command>
@@ -363,7 +363,7 @@
   </system>
   <system>
     <name>gamegear</name>
-    <fullname>Sega Gamegear</fullname>
+    <fullname>Sega Game Gear</fullname>
     <path>%ROMPATH%/gamegear</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/genesis_plus_gx_libretro.so %ROM%</command>
@@ -381,7 +381,7 @@
   </system>
   <system>
     <name>gb</name>
-    <fullname>Game Boy</fullname>
+    <fullname>Nintendo Game Boy</fullname>
     <path>%ROMPATH%/gb</path>
     <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/bsnes_libretro.so %ROM%</command>
@@ -390,7 +390,7 @@
   </system>
   <system>
     <name>gba</name>
-    <fullname>Game Boy Advance</fullname>
+    <fullname>Nintendo Game Boy Advance</fullname>
     <path>%ROMPATH%/gba</path>
     <extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_gba_libretro.so %ROM%</command>
@@ -399,7 +399,7 @@
   </system>
   <system>
     <name>gbc</name>
-    <fullname>Game Boy Color</fullname>
+    <fullname>Nintendo Game Boy Color</fullname>
     <path>%ROMPATH%/gbc</path>
     <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/bsnes_libretro.so %ROM%</command>
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 041ae13b3..be2f597ba 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -345,7 +345,7 @@
   </system>
   <system>
     <name>fds</name>
-    <fullname>Famicom Disk System</fullname>
+    <fullname>Nintendo Famicom Disk System</fullname>
     <path>%ROMPATH%\fds</path>
     <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\nestopia_libretro.dll" %ROM%</command>
@@ -363,7 +363,7 @@
   </system>
   <system>
     <name>gamegear</name>
-    <fullname>Sega Gamegear</fullname>
+    <fullname>Sega Game Gear</fullname>
     <path>%ROMPATH%\gamegear</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
@@ -381,7 +381,7 @@
   </system>
   <system>
     <name>gb</name>
-    <fullname>Game Boy</fullname>
+    <fullname>Nintendo Game Boy</fullname>
     <path>%ROMPATH%\gb</path>
     <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command>
@@ -390,7 +390,7 @@
   </system>
   <system>
     <name>gba</name>
-    <fullname>Game Boy Advance</fullname>
+    <fullname>Nintendo Game Boy Advance</fullname>
     <path>%ROMPATH%\gba</path>
     <extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_gba_libretro.dll" %ROM%</command>
@@ -399,7 +399,7 @@
   </system>
   <system>
     <name>gbc</name>
-    <fullname>Game Boy Color</fullname>
+    <fullname>Nintendo Game Boy Color</fullname>
     <path>%ROMPATH%\gbc</path>
     <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command>