Changed some functions to theme constants in header