Rename functions
Merge instead of push
Refactor heartbeat and move startup to B3_Theme
Minor refactor on base collection