small bugfixes for theming+sass+templates

change ruby and to &&

(cherry picked from commit 6560c4faf80314e3c143a634baee5b435a2abfa2)