Swing refactor and color