Correct Categorization

+ Recombined enums
+ input updates for ports to check