Merge changes from develop branch - Initial implementation of lights and setup tabs