Remove debug code
Add default theme
Display error message if have