Minor adjusments + added 1 theme