Continued work with new theme