Merge pull request #1145 from Arantor/release-2.1

Theme fixes
Merge pull request #1146 from Arantor/release-2.1

More theme fixes
Merge pull request #1148 from Arantor/release-2.1

Minor fixes
! optgroup FTW

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1149 from Oldiesmann/release-2.1

! optgroup FTW