[arctic] - Update for modal & macros