Things may be added to this list and it is probably not definitive; if you print it, it would save trees if you pasted it into a word processing file and made columns first. It's also a good idea to add place names to the people to help you remember (e.g., Archilochus of Paros [the poet who was also a mercenary soldier]).

Who

Aeschylus
Alcaeus
Alcmaeon
Alcmaeonidae
Alexander I of Macedon
Archilochus
Aristagoras
Aristeides
Aristodemus
Aristogeiton
Aristomenes
Artaphrenes
Astyages
Bacchiads
Callimachus
Cambyses
Cleisthenes (2)
Cleomenes I
Croesus
Cylon
Cypselus
Cyrus I
Darius I
Datis
Demaratus
Dorians
Draco(n)
Eurybiades
Gelon
Gyges
Harmodius
Hecataeus of Miletus
Herodotus
Hesiod
Hipparchus
Hippias
Histiaeus of Miletus
Hittites
Homer
Ionians
Isagoras
Leonidas
Lycurgus (2)
Mardonius
Megacles (2)
Miltiades (d. ca. 489)
Orthagoras
Pausanias
Peisistratos
Periander
Pheidon
Philaidae
Polycrates
Sappho
Solon
Thales
Themistocles
Theseus
Thrasyboulos
Tyrtaeus
Xanthippus
Xerxes

What

Amphictyony
Apoikia
Archon
Areopagos
Basileus
Battle of Artemisium
Battle of Lade
Battle of Marathon
Battle of Mycale
Battle of Plataea
Battle of Salamis
Battle of Sepeia
Battle of the Champions
Battle of the Great Trench
Battle of Thermopylae
Boule (Council of 500)
Demes
Ecclesia
Ephors
Eupatrids
Gerousia
Helots
Hippeis
Ionian revolt
Krypteia
Lelantine War
Linear A
Linear B
Medizing
Messenian Wars
Mycenaean age
Oikist
Ostracism
Panathenaia
Panionion
Pentekosiomedimnoi
Perioikoi
Polemarch(os)
Polis
Prytany
Rhetra
Satrapy
Seisachtheia
Strategos
Thesmothetai
Thetes
Tyranny
Trojan War
Wanax
Zeugitai

Where

Aegina
Arcadia
Argos
Artemision
Athens
Boiotia
Byzantion
Carthage
Chalcedon
Chalcidice
Chalcis
Corcyra
Corinth
Cumae
Cyrene
Delos
Delphi
Dodona
Egypt
Elis
Epidamnus
Eretria
Euboea
Ithome
Knos(s)os
Laconia
Massalia
Megara
Messenia
Miletus
Mycenae
Naxos
Olympia
Orchomenos (in Boiotia)
Peiraeus
Phocis
Phoenicia
Plataea
Poteidaia
Pylos
Rhegion
Rhodes
Salamis
Samos
Sardis
Sicyon
Sparta
Syracuse
Tegea
Thasos
Thebes
Thessaly
Thermopylae
Thracian Chersonesus

Themes and other important things to think about: dates and major characteristics of periods; evidence for society/organization/economy of the various periods and phenomena, e.g.: Mycenaean palace organization, polis vs. ethnos in early Archaic period, 'things' associated with tyrants, the 'multiplier phenomenon', agrarianism, types of evidence in Herodotus, especially on Persian wars and prominent Greek states; inter-state rivalries; political evolution.