removed stockd orange/blue macros