67864824 update schemes

Add proper schemes and preprocessor macros