diff --git a/TOPICS.md b/TOPICS.md
index 3809c9f..8193027 100644
--- a/TOPICS.md
+++ b/TOPICS.md
@@ -12,6 +12,8 @@
 elaborate on it in the hopes of it one day becoming a common schema (with common
 "See also" links between topics, and other metadata) so that this information
 can be presented in a combined, navigable fashion or something.
+
+TODO: Geometry, Industry, Zoology, Biology, Telephony, Labyrinths
 
 Vertical
 --------
@@ -40,7 +42,7 @@
 *   used-in: bookmarks
 *   see-also: x86, Retrocomputing, Commodore 64, VIC-20, Apple II
 
-Works regarding the MOS 6502 computer processing unit (CPU) and
+Works regarding the MOS 6502 microprocessor, and
 programming in the machine language of same.
 
 ### Abstract Algebra
@@ -75,6 +77,7 @@
 
 *   used-in: bookmarks
 *   see-also: Logic
+*   wikipedia: https://en.wikipedia.org/wiki/Algebraic_logic
 
 Works regarding the subject of algebraic logic, that is, treating logical systems
 as abstract algebraic structures, with algebraic properties.
@@ -83,6 +86,7 @@
 
 *   used-in: bookmarks
 *   see-also: Computational Complexity
+*   wikipedia: https://en.wikipedia.org/wiki/Algorithm
 
 Works regarding algorithms.
 
@@ -97,6 +101,7 @@
 
 *   used-in: bookmarks
 *   see-also: Retrocomputing, 6502, BASIC
+*   wikipedia: https://en.wikipedia.org/wiki/Apple_II
 
 Works regarding the Apple II computer system, including its architecture,
 software and games available for it, and programming of it.
@@ -270,6 +275,7 @@
 
 *   used-in: bookmarks
 *   see-also: Theorem Proving, Calculus of Constructions
+*   wikipedia: https://en.wikipedia.org/wiki/Rocq
 
 Works regarding the proof assistant Coq and its language Gallina.
 
@@ -282,6 +288,7 @@
 ### Docker
 
 *   used-in: bookmarks
+*   wikipedia: https://en.wikipedia.org/wiki/Docker_(software)
 
 Works regarding the software containerization tool known as Docker.
 
@@ -289,6 +296,7 @@
 
 *   used-in: bookmarks
 *   see-also: Retrocomputing
+*   wikipedia: https://en.wikipedia.org/wiki/DOS
 
 Works regarding the operating system DOS, including Microsoft's MS-DOS
 as well as clones such as PCDOS and FreeDOS.
@@ -349,6 +357,7 @@
 
 *   used-in: bookmarks
 *   see-also: Logic, Term Rewriting, Universal Algebra
+*   wikipedia: https://en.wikipedia.org/wiki/Equational_logic
 
 Works regarding the subject of equational logic, that is, logical
 systems based on the properties of equivalence relations
@@ -359,7 +368,8 @@
 
 *   used-in: Chrysoberyl
 
-.
+Specific, chronologically-delimited social activities, usually of a collective
+and/or nominally competitive nature.
 
 ### FoM
 
@@ -367,7 +377,8 @@
 *   used-in: bookmarks
 *   see-also: Mathematics, Logic, Incompleteness
 
-.
+Works regarding the foundations of mathematics, including systems in which doing
+mathematics is possible, and the philosophical underpinnings of mathematics.
 
 ### Forks
 
@@ -383,7 +394,7 @@
 *   used-in: bookmarks
 *   see-also: Attribute Grammars, Parsing
 
-.
+Works on the subject of formal language theory.
 
 ### Formal Specification
 
@@ -657,14 +668,16 @@
 ### Narratology
 
 *   used-in: books
-
-.
+*   wikipedia: https://en.wikipedia.org/wiki/Narratology
+
+Works regarding the study of storytelling.
 
 ### Nautilus
 
 *   used-in: bookmarks
-
-.
+*   wikipedia: https://en.wikipedia.org/wiki/GNOME_Files
+
+Works regarding the official file manager tool used in the GNOME desktop environment.
 
 ### .NET
 
@@ -690,8 +703,10 @@
 
 *   used-in: bookmarks
 *   see-also: Mathematics
-
-.
+*   wikipedia: https://en.wikipedia.org/wiki/Order_theory
+
+Works regarding the study of the intuitive notion of order, in a mathematical setting,
+using binary relations.
 
 ### PLDI
 
@@ -771,21 +786,16 @@
 ### PostgreSQL
 
 *   used-in: bookmarks
+*   wikipedia: https://en.wikipedia.org/wiki/PostgreSQL
 
 Works pertaining to the use and study of the open-source relational database software PostgreSQL
 (a.k.a. Postgres).
 
-### Practice
-
-*   used-in: books
-*   deprecated: true
-
-.
-
 ### Probability Theory
 
 *   used-in: books, bookmarks
 *   see-also: Mathematics
+*   wikipedia: https://en.wikipedia.org/wiki/Probability_theory
 
 .
 
@@ -801,6 +811,7 @@
 
 *   used-in: bookmarks
 *   see-also: Logic Programming, Programming Languages
+*   wikipedia: https://en.wikipedia.org/wiki/Prolog
 
 Works regarding the logic programming language Prolog.
 
@@ -808,6 +819,7 @@
 
 *   used-in: bookmarks
 *   see-also: Logic
+*   wikipedia: https://en.wikipedia.org/wiki/Proof_theory
 
 Works regarding the study of proofs as mathematical objects in their own right.
 
@@ -846,13 +858,6 @@
 
 .
 
-### Reference
-
-*   used-in: books
-*   deprecated: true
-
-.
-
 ### Refinement Calculus
 
 *   used-in: books, bookmarks
@@ -906,6 +911,7 @@
 
 *   used-in: books, bookmarks
 *   see-also: Formal Specification, Reactive Systems, Agile Development
+*   wikipedia: https://en.wikipedia.org/wiki/Software_engineering
 
 .
 
@@ -926,6 +932,7 @@
 
 *   used-in: bookmarks
 *   see-also: Equational Logic
+*   wikipedia: https://en.wikipedia.org/wiki/Rewriting#Term_rewriting_systems
 
 .
 
@@ -938,13 +945,6 @@
 Works regarding the Tandy TRS-80 computer system (in particular the
 CoCo), including its computer architecture, software and games
 available for it, and programming of it.
-
-### Theory
-
-*   used-in: books
-*   deprecated: true
-
-.
 
 ### Theory of Computation
 
@@ -981,8 +981,9 @@
 *   title: TLA+
 *   used-in: bookmarks
 *   see-also: Formal Specification, Model Checking
-
-.
+*   wikipedia: https://en.wikipedia.org/wiki/TLA+
+
+Works regarding the specification language TLA+ and its underlying logic.
 
 ### Tools
 
@@ -994,6 +995,7 @@
 
 *   used-in: bookmarks
 *   see-also: Mathematics, Closure Systems
+*   wikipedia: https://en.wikipedia.org/wiki/Topology
 
 .
 
@@ -1002,7 +1004,9 @@
 *   used-in: bookmarks
 *   see-also: PLDI, Type Theory
 
-.
+Works regarding the study and practice of assigning types (collections of constraints)
+to values as part of informatically processing those values, for example in a computer
+program.
 
 ### Type Theory
 
@@ -1016,13 +1020,15 @@
 *   used-in: bookmarks
 *   see-also: Logic Programming
 
-.
+Works regarding the theory and practice of deciding if two objects containing
+unknowns can be made equal by assigning some concrete values to their unknowns.
 
 ### User Interface
 
 *   used-in: bookmarks
 
-.
+Works regarding the design and theory of user interfaces, as means by whch a human
+and a computer may interact.
 
 ### VIC-20
 
@@ -1044,12 +1050,15 @@
 ### Writing
 
 *   used-in: books
-
-.
+*   wikipedia: https://en.wikipedia.org/wiki/Writing
+
+Works regarding the activity and discipline of composing written material.
 
 ### x86
 
 *   used-in: bookmarks
 *   see-also: 6502
-
-.
+*   wikipedia: https://en.wikipedia.org/wiki/X86
+
+Works regarding the computer architecture based originally on the Intel 80x86 line
+of microprocessors, and programming in the machine language of same.
diff --git a/schema/Topic.md b/schema/Topic.md
index 74bd275..0cdbc8f 100644
--- a/schema/Topic.md
+++ b/schema/Topic.md
@@ -16,12 +16,6 @@
 
 The displayed title of the topic
 
-### wikipedia
-
-*   optional: true
-
-URL of the Wikipedia article for the topic
-
 ### used-in
 
 "bookmarks", "books", or "chrysoberyl", or a list of these
@@ -32,9 +26,8 @@
 
 A list of other Topics to which this Topic relates
 
-### deprecated
+### wikipedia
 
 *   optional: true
 
-If true, we've decided this Topic is not a good way to classify things
-and we're trying to get rid of it.
+URL of the Wikipedia article for the topic