Major cleanup and refactor

Keeps silly color highlights and random font-sizes for now