Rework way things are rendered
Update theme function
Context reaction to place the container
Readme