Improve modularity, use R topo colors