Add width/height variables for screengen