Minor name changes

-tag lamp  type
Moved macros to correct file for use

Macros are now placed in ui.c and duplicated #include removed