Fixed Up Options + MacroActions