Finished 4 X 4

Done finishing 4 X 4 Mode for both themes