Chameleon, you may want to add Breakbeat, as it's a common sub-genre of electronic music that's not to be confused with "Broken Beat". You'll find info on Wiki.
IDM may be another one to add.
Also, when you get more time, you may consider delving into the types and styles of these sub-genres and the notable characteristics of each.
__________________
|