Flipping the switch for "base-2104" as the default theme.
Merge remote-tracking branch 'upstream/master'