Fixing variables being passed to theme to show values