Declining Naxus and Athenae

Hi,…I’m having trouble declining these two words (the Greek island and City)

Can anyone help?

my own attempt:

naxus, naxe, naxum, naxi, naxo, naxo (no plural presumably)

Locative: naxi?

Athenae, Athenae, Athenas, Athenarum, Athenis, Athenis (plural form).

Locative: Athenae

Bona quaestio haec.
Athēnīs locativo casu quod pluraliter; aliis primae secundaeve declinationis verbis quorum singulus numerus exstat, singulariter genetivo: ergo Naxi, ut dicis. Vide A&G in sectione quadringentesimâ vicesimâ septimâ, paragrapho tertio, notâ primâ.

See A&G §427.3 note 1: locative is genitive of 1st/2nd decl. nouns in singular, and dative/ablative in plural or 3rd decl., so Athēnīs and Naxī in the locative.

Gratias Tibi ago