Updated themes templates