Minor changes, added new storage type, thus more colors.