also shiny singu and shiny singu-dagger
Unupgrade, unpolish added. Also fixed filter:both bugs