Adapt Messages handling for new container based one

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Add Hotline Miami

Signed-off-by: Christopher Larson <kergoth@gmail.com>