Finished the themes with custom icons