Added config categories
Refactoring
More Refactoring
Configurable armor