Corrected plugin file discovery
Added widget support