Display plugins as well as themes

Plugins are now displayed as well in the same loop that displays themes
without making use of any duplicate code.