Add files that moved
Fix color well to stop being so jumpy