Fixed style keys that have "-" in the keys
Added repeat index into the scope