Olivia added new Universe Window and style sheet for old windows
Merge origin/master