implemented stroke and moved color stuff around