If there is a way for ThemeActivity to save the current AppTheme when it is recreated, that would be great. I noticed it just falls back to the original theme from getStartTheme() even though theme changes have been made at runtime.