Implemented Theme 2 as a selectable option. Made some minor code cleanup and tweaks.