Change theme initialization
Remove previous theme files
Remove unused code