Add Flipswitch and updated Activator headers