Revert "Template change and categories"

This reverts commit 0ced2029e2289f37d926e9bed2411ff0cb468db7.
merged the lot