continued massive structure + theme improvements