added theme and layout