Another template microfix
Another template microfix
Final themes update