New app stuff, cleaning of code and theme