put weaps in own package; color bugfix; editor naming conventions
missed the definitions