Sonne & Solarium

[MOVE-TO PLACEHOLDER for #262, WS#4]