Theme little refactoring