Add sample for every theme, fix compact theme