Updated theme support.   Removed more flickers smoother loading