Switch to dolistc
Add missing case
Rename branch -> trunk
Fix some colours