Added separate theme with minimal improvements