Added themes & added more to Work