P-Switch WIP

Some Default Graphical Changes