Updated types, css needs to be reworked. See comments in https://github.com/rikardq/rimi/issues/13