Readd some logic details that are needed. Fix colors on some blocks being black