diff --git a/setup.py b/setup.py
index 56d62c2..b64f207 100644
--- a/setup.py
+++ b/setup.py
@@ -38,9 +38,8 @@ setup(name='snarl',
             'Intended Audience :: Information Technology',
             'Intended Audience :: Manufacturing',
             'Intended Audience :: Science/Research',
-            'License :: OSI Approved :: GNU General Public License v3',
+            'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
             'Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)',
-            'Topic :: Scientific/Engineering :: Visualization',
       ],
       keywords=[
           'layout',
@@ -48,6 +47,7 @@ setup(name='snarl',
           'CAD',
           'EDA',
           'electronics',
+          'photonics',
           'IC',
           'mask',
           'pattern',
@@ -57,6 +57,7 @@ setup(name='snarl',
           'short',
           'unintentional',
           'label',
+          'schematic',
       ],
       )