Revert "Revert "Mako Gamma Control""

This reverts commit e3b3c6c09ea402cd8dc8dba6aceab4561e0c472c.