diff --git a/catalog.cfg b/catalog.cfg
index c77931a..a3cc4c2 100644
--- a/catalog.cfg
+++ b/catalog.cfg
@@ -1,3 +1,5 @@
+ParseVariables Yes
+
 # File locations
 RunDir var/run
 ErrorFile var/log/error.log
@@ -9,8 +11,6 @@ VariableDatabase site
 
 HTMLsuffix .itl
 
-ParseVariables Yes
-
 # Host configuration
 VendURL http://__SERVER_NAME____CGI_URL__
 SecureURL https://__SERVER_NAME____CGI_URL__
@@ -18,10 +18,13 @@ MailOrderTo __ORDERS_TO__
 ImageDir __IMAGE_URL__/
 
 # Custom functions
-include code/*.*
+include code/*.action
+include code/*.filter
+include code/*.sub
+include code/*.tag
 
 # Profiles
-OrderProfile profiles/*
+OrderProfile profiles/*.profile
 
 # Autoload
 Autoload init
@@ -72,9 +75,7 @@ UserDB default crypt			 0
 OrderCounter var/run/order.number
 
 # Jobs
-ParseVariables Yes
 Jobs base_directory jobs
 Jobs email __JOBS_TO__
 Jobs log var/log/jobs.log
 Jobs use_global 1
-ParseVariables No
diff --git a/profiles/register b/profiles/register.profile
similarity index 100%
rename from profiles/register
rename to profiles/register.profile