Move saving of custom themes into Configuration since now it is used only there