Added 2 Color-Codes + Tidied some things up.