Clean code. Change theme structure.