Revert "CM11 Themes: Delay setting default theme"

This reverts commit 293d7e8547a05bcb17042402c18849571cd1edcf.