added variables arg to all theme definitions