Refactor warez, improve looks