Made haxrcorp Uniform - Final Commit