Small changes

Changed themes for airline and moved around some of the code