Types of resistors and capacitors

I'm making an Access database to "finally" keep an inventory of the gazillion parts I have lying around and to label drawers and cabinets. I'm tired of rumaging through bags and boxes.

I've searched google, wikipedia and various sites, as well as checked Digikey to see what they use. So far I have:

Resistors:
Carbon composition (old baked type)
Carbon film (common today)
Ceramic
Metal element (?)
Metal film
Metal foil
Metal oxide film
Wirewound
Thick film
Thin film

Capacitors:
Aluminium electrolytic
Aluminium polymer
Ceramic
MICA
PTFE
Niobium Oxide
Tantalum
Tantalum polymer
Silicon
Thin film
Acrylic metalized
Polyester
Polyester metalized
PEN
PET
PP
PP metalized
Polymer metalized (same as aluminium polymer ?)


The problem is that not all sites use the same words. I could use a hand in removing duplicates and adding any missing varieties.

I ignored the mega-capacitors used in high tension applications. It's not like I'm going to build a dam.

Robert