Updated codeing style and update file locations
Updated theme logic - part I
Updated theme logic -I part I
Added the missing documentation for the new theme functions
Merge branch 'clean_up_relations' into development