Fixed duplicate theme issue and renamed grey->gray to be consistent