Sync
Use a singleton pattern & rename globals
Move getIcon
Bump