Fix themes and other basic settings
Fix trailing comma in basic settings