Fixed template namign problems
Fixed hook_theme