Make variables optional
Remove render partial inside theme