diff --git a/gulpfile.ts b/gulpfile.ts
index a688cc1e..44a585f2 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -24,15 +24,15 @@ process.env.FORCE_COLOR = '1';
 type Callback = () => void;
 
 // prettier-ignore
-const reload = (cb: Callback) => { browserSync.reload(); cb(); }
-const clean = async () => exec(`rm -rf ${__dirname}/dist/*`);
+const reload = (cb: Callback): void => { browserSync.reload(); cb(); }
+const clean = async (): Promise<any> => exec(`rm -rf ${__dirname}/dist/*`);
 export { clean, reload };
 
 /**
  * Version bump the required files according to the version in package.json
  * Append link to changelog for current version in readme.txt
  */
-export function bump() {
+export function bump(): NodeJS.ReadWriteStream {
     const re = `== Changelog ==\n(?!\n= ${VERSION})`;
     const repl =
         '== Changelog ==\n\n' +
@@ -58,7 +58,7 @@ export function bump() {
 }
 
 // Translations
-export function pot() {
+export function pot(): NodeJS.ReadWriteStream {
     return gulp
         .src('./src/**/*.php', { base: 'dist/*' })
         .pipe(sort())
@@ -80,7 +80,7 @@ export function pot() {
 //              PHP/Static Asset Tasks
 // ==================================================
 
-export function staticFiles() {
+export function staticFiles(): NodeJS.ReadWriteStream {
     const misc = gulp
         .src('src/**/*.{po,pot,mo,html,txt,json,php}', {
             base: './src',
@@ -101,7 +101,7 @@ export function staticFiles() {
 //                 Style Tasks
 // ==================================================
 
-export function styles() {
+export function styles(): NodeJS.ReadWriteStream {
     let stream = gulp.src('src/css/**/[^_]*.scss', { base: './src' });
 
     if (!IS_PRODUCTION) {
@@ -133,7 +133,7 @@ export function styles() {
 //                 Javascript Tasks
 // ==================================================
 
-export function bundle(cb: Callback) {
+export function bundle(cb: Callback): void {
     const args = IS_PRODUCTION ? ['-p'] : [];
     const child = spawn(`${__dirname}/node_modules/.bin/webpack`, args, {
         env: process.env,
@@ -164,7 +164,7 @@ export function bundle(cb: Callback) {
     if (!IS_PRODUCTION) return cb();
 }
 
-export function js() {
+export function js(): NodeJS.ReadWriteStream {
     let stream = gulp.src('src/**/*.js', { base: './src' });
     if (IS_PRODUCTION) {
         stream = stream.pipe(uglify());
diff --git a/lib/scripts/before-test.ts b/lib/scripts/before-test.ts
index 257ca783..60f179fb 100644
--- a/lib/scripts/before-test.ts
+++ b/lib/scripts/before-test.ts
@@ -19,11 +19,11 @@ window.ABT = {
 class Storage {
     private items = new Map<string, string>();
 
-    getItem(key: string) {
+    getItem(key: string): string | null {
         return this.items.get(key) || null;
     }
 
-    setItem(key: string, value: string) {
+    setItem(key: string, value: string): void {
         this.items.set(key, value);
     }
 }
diff --git a/lib/scripts/update-styles.ts b/lib/scripts/update-styles.ts
index 4f2e3e19..4b798966 100644
--- a/lib/scripts/update-styles.ts
+++ b/lib/scripts/update-styles.ts
@@ -69,7 +69,7 @@ async function getData(): Promise<StyleResponse> {
             }
         }
     `;
-    return new Promise<StyleResponse>((resolve, reject) => {
+    return new Promise<StyleResponse>((resolve, reject): void => {
         const options = {
             hostname: 'api.github.com',
             path: '/graphql',
@@ -156,7 +156,7 @@ function getNewStyles(before: StyleData, after: StyleObj[]): string[] {
     return Array.from(newlyAddedStyles);
 }
 
-async function main() {
+(async (): Promise<void> => {
     let newData: StyleData;
     try {
         newData = await getData().then(parseStyleObj);
@@ -171,8 +171,4 @@ async function main() {
         path.resolve(__dirname, '../../src/vendor/', 'citation-styles.json'),
         JSON.stringify(newData, null, 4),
     );
-}
-
-main().catch(e => {
-    throw e;
-});
+})();
diff --git a/lib/scripts/update-translations.ts b/lib/scripts/update-translations.ts
index af0ba6fe..1864e4dd 100644
--- a/lib/scripts/update-translations.ts
+++ b/lib/scripts/update-translations.ts
@@ -77,7 +77,7 @@ const LANGS: ReadonlyMap<string, string[]> = new Map([
     ],
 ]);
 
-async function getTranslations() {
+async function getTranslations(): Promise<void> {
     await exec(`rm -f ${ROOT_DIR}/src/languages/*`);
     const languages = (await sendRequest<Langs>('/languages/list', {})).result.languages.filter(
         l => l.percentage > 0 && l.code !== 'en-us',
@@ -101,7 +101,7 @@ async function getTranslations() {
     }
 }
 
-async function updateTerms() {
+async function updateTerms(): Promise<void> {
     const req = `
         curl -X POST https://api.poeditor.com/v2/projects/upload \
         -F api_token="${TOKEN}" \
@@ -118,7 +118,7 @@ async function updateTerms() {
     );
 }
 
-async function updateTranslationStatus() {
+async function updateTranslationStatus(): Promise<void> {
     interface LangWithContribs extends Language {
         contributors: string[];
     }
@@ -182,14 +182,14 @@ async function updateTranslationStatus() {
     await writeFile(`${ROOT_DIR}/README.md`, newReadme);
 }
 
-(async () => {
+(async (): Promise<void> => {
     await updateTerms();
     await getTranslations();
     await updateTranslationStatus();
 })();
 
 async function sendRequest<T>(endpoint: string, data: object): Promise<API<T>> {
-    return new Promise<API<T>>((resolve, reject) => {
+    return new Promise<API<T>>((resolve, reject): void => {
         const qs = stringify({
             api_token: TOKEN,
             id: PROJECT_ID,
diff --git a/lib/types/globals.d.ts b/lib/types/globals.d.ts
index a88aa89f..4fe3db2e 100644
--- a/lib/types/globals.d.ts
+++ b/lib/types/globals.d.ts
@@ -77,4 +77,5 @@ declare module 'react-select-fast-filter-options';
 declare module 'react-virtualized-select';
 declare module 'rollbar-sourcemap-webpack-plugin';
 declare module 'rollbar/dist/rollbar.umd';
+declare module 'string-hash';
 declare module 'uglify-es';
diff --git a/package-lock.json b/package-lock.json
index 0438c05a..c22a27f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,7 +68,7 @@
       "dev": true,
       "requires": {
         "@types/cheerio": "0.22.3",
-        "@types/react": "16.0.16"
+        "@types/react": "16.0.18"
       }
     },
     "@types/glob": {
@@ -198,10 +198,10 @@
       "dev": true
     },
     "@types/react": {
-      "version": "16.0.16",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.16.tgz",
+      "version": "16.0.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.18.tgz",
       "integrity":
-        "sha512-38DE4jdBCYUCa+YBIkcVMg7YKMexD2vLQU3j4DqDYuxnaecNYYJKe+mhR7b9hrNxocRpA+B+11ZvxRd1GlPMXg==",
+        "sha512-cUe8Dj0K0I826OLeC2BUsWa3DaGgRR2KaslmEI8R3Ma46dc52hqKIqC4iPQ30Jncz39E7JAytmxweUsu53QHZw==",
       "dev": true
     },
     "@types/react-dom": {
@@ -212,7 +212,7 @@
       "dev": true,
       "requires": {
         "@types/node": "8.0.46",
-        "@types/react": "16.0.16"
+        "@types/react": "16.0.18"
       }
     },
     "@types/react-motion": {
@@ -222,7 +222,7 @@
         "sha512-y0gHZ5Gghz4+/uQ8NLI35zFiOjI709wGrfbY+jC1EvoQwKbB9S+mCFDOk1s9o8C6+4OC5NcGigro1nPZ+ZceAg==",
       "dev": true,
       "requires": {
-        "@types/react": "16.0.16"
+        "@types/react": "16.0.18"
       }
     },
     "@types/react-test-renderer": {
@@ -233,7 +233,7 @@
         "sha512-tbuDajGYu8tEBAGVXZqh0Hmfm+pZA9P+4UfMIWTvzO4PA8yBbL2TCsZNSky+S74oAKy96Z/PBdDTj22iPMYqcQ==",
       "dev": true,
       "requires": {
-        "@types/react": "16.0.16"
+        "@types/react": "16.0.18"
       }
     },
     "@types/source-map": {
@@ -14770,9 +14770,9 @@
       "dev": true
     },
     "string-hash": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.1.tgz",
-      "integrity": "sha1-joW+0pHgdjuPaAnZwzaP6gSNs9w="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
+      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
     },
     "string-length": {
       "version": "2.0.0",
@@ -14915,6 +14915,13 @@
         "string-hash": "1.1.1",
         "stylis": "3.3.2",
         "stylis-rule-sheet": "0.0.6"
+      },
+      "dependencies": {
+        "string-hash": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.1.tgz",
+          "integrity": "sha1-joW+0pHgdjuPaAnZwzaP6gSNs9w="
+        }
       }
     },
     "stylis": {
diff --git a/package.json b/package.json
index bad4f64b..bb322b84 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@types/jest": "^21.1.4",
     "@types/jquery": "^3.2.15",
     "@types/node": "^8.0.46",
-    "@types/react": "^16.0.16",
+    "@types/react": "^16.0.18",
     "@types/react-dom": "^16.0.2",
     "@types/react-motion": "^0.0.23",
     "@types/react-test-renderer": "^16.0.0",
@@ -105,6 +105,7 @@
     "react-motion": "^0.5.2",
     "react-select-fast-filter-options": "^0.2.3",
     "react-virtualized-select": "^3.1.0",
+    "string-hash": "^1.1.3",
     "styled-jsx": "^2.1.2",
     "tinycolor2": "^1.4.1",
     "typescript": "^2.5.3",
diff --git a/src/academic-bloggers-toolkit.pot b/src/academic-bloggers-toolkit.pot
index c70815be..0472b63a 100644
--- a/src/academic-bloggers-toolkit.pot
+++ b/src/academic-bloggers-toolkit.pot
@@ -23,7 +23,7 @@ msgstr ""
 msgid "<strong>Notice:</strong> Rich editing must be enabled to use the Academic Blogger's Toolkit plugin"
 msgstr ""
 
-#: php/backend.php:121
+#: php/backend.php:109
 msgid "Reference List"
 msgstr ""
 
diff --git a/src/js/components/badge.tsx b/src/js/components/badge.tsx
index f5dd7134..4a8dd2ee 100644
--- a/src/js/components/badge.tsx
+++ b/src/js/components/badge.tsx
@@ -12,7 +12,7 @@ export default class Badge extends React.PureComponent<Props> {
     static defaultProps: Partial<Props> = {
         color: `${colors.blue}`,
     };
-    render() {
+    render(): JSX.Element {
         const { count, color } = this.props;
         return (
             <div style={{ background: color }}>
diff --git a/src/js/components/button.tsx b/src/js/components/button.tsx
index 66a28b05..d49e6c8c 100644
--- a/src/js/components/button.tsx
+++ b/src/js/components/button.tsx
@@ -36,15 +36,15 @@ export default class Button extends React.PureComponent<Props, State> {
         };
     }
 
-    hideTooltip = () => {
+    hideTooltip = (): void => {
         this.setState(prev => ({ ...prev, isShowingTooltip: false }));
     };
 
-    openLink = () => {
+    openLink = (): void => {
         window.open(this.props.href, '_blank');
     };
 
-    showTooltip = (e: React.MouseEvent<HTMLButtonElement>) => {
+    showTooltip = (e: React.MouseEvent<HTMLButtonElement>): void => {
         const { position } = this.props.tooltip!;
         const rect = e.currentTarget.getBoundingClientRect();
         this.setState(() => ({
@@ -55,7 +55,7 @@ export default class Button extends React.PureComponent<Props, State> {
 
     // Below is disabled because the class fallbacks aren't complexity-adding.
     // tslint:disable-next-line cyclomatic-complexity
-    render() {
+    render(): JSX.Element {
         const {
             flat,
             focusable,
diff --git a/src/js/components/callout.tsx b/src/js/components/callout.tsx
index 23467873..efdab8e4 100644
--- a/src/js/components/callout.tsx
+++ b/src/js/components/callout.tsx
@@ -24,7 +24,7 @@ export default class Callout extends React.PureComponent<Props> {
         error: top.ABT.i18n.errors.prefix,
     };
 
-    render() {
+    render(): JSX.Element | null {
         const { title, children, intent, isVisible, onDismiss, ...divProps } = this.props;
         const defaultTitle =
             intent === 'danger' ? Callout.prefixes.error : Callout.prefixes.warning;
diff --git a/src/js/components/spinner.tsx b/src/js/components/spinner.tsx
index 4db1cc90..a7e605b4 100644
--- a/src/js/components/spinner.tsx
+++ b/src/js/components/spinner.tsx
@@ -35,7 +35,7 @@ export default class Spinner extends React.PureComponent<Props> {
         this.style.backgroundColor = this.props.overlay ? undefined : this.props.bgColor;
     }
 
-    render() {
+    render(): JSX.Element {
         const cn = this.props.overlay ? 'abt-spinner abt-spinner_overlay' : 'abt-spinner';
         return (
             <div className={cn} style={this.style}>
diff --git a/src/js/components/toggle-switch.tsx b/src/js/components/toggle-switch.tsx
index 3fe408fd..14c4245e 100644
--- a/src/js/components/toggle-switch.tsx
+++ b/src/js/components/toggle-switch.tsx
@@ -23,9 +23,9 @@ export default class ToggleSwitch extends React.Component<Props, State> {
         };
     }
 
-    hideTooltip = () => this.setState(prev => ({ ...prev, isShowingTooltip: false }));
+    hideTooltip = (): void => this.setState(prev => ({ ...prev, isShowingTooltip: false }));
 
-    showTooltip = (e: React.MouseEvent<HTMLSpanElement>) => {
+    showTooltip = (e: React.MouseEvent<HTMLSpanElement>): void => {
         const { position } = this.props.tooltip;
         const rect = e.currentTarget.getBoundingClientRect();
         this.setState(() => ({
@@ -34,7 +34,7 @@ export default class ToggleSwitch extends React.Component<Props, State> {
         }));
     };
 
-    render() {
+    render(): JSX.Element {
         const { checked, disabled, onChange, tooltip } = this.props;
         const { isShowingTooltip, transform } = this.state;
         return (
diff --git a/src/js/components/tooltip.tsx b/src/js/components/tooltip.tsx
index d554f688..f0d79ae0 100644
--- a/src/js/components/tooltip.tsx
+++ b/src/js/components/tooltip.tsx
@@ -54,7 +54,7 @@ export default class Tooltip extends React.PureComponent<Props> {
                     translateX(-5px)`;
         }
     };
-    render() {
+    render(): JSX.Element {
         const { active, id, text, transform } = this.props;
         return (
             <div
diff --git a/src/js/core/locale-store.ts b/src/js/core/locale-store.ts
index 37e71ed4..2cc58855 100644
--- a/src/js/core/locale-store.ts
+++ b/src/js/core/locale-store.ts
@@ -89,7 +89,7 @@ export class LocaleStore {
      * Takes locale files send via the Workers `postMessage` channel and saves them to the cache.
      * Once all files retrieved, the worker sends `done` and the cache is pushed into localStorage.
      */
-    private receiveMessage = (e: MessageEvent) => {
+    private receiveMessage = (e: MessageEvent): void => {
         if (e.data[0] === 'done') {
             const localeObj: LocaleCache = {
                 time: Date.now(),
diff --git a/src/js/core/processor.ts b/src/js/core/processor.ts
index e2da024b..7cf1918a 100644
--- a/src/js/core/processor.ts
+++ b/src/js/core/processor.ts
@@ -91,9 +91,15 @@ export class Processor {
      * @param csl CSL.Data[].
      */
     prepareInlineCitationData(csl: CSL.Data[]): Citeproc.Citation {
+        // prettier-ignore
+        const citationItems = Array.from(
+            new Set(
+                csl.map(item => item.id)
+            )
+        ).map(id => ({ id }));
         return {
             citationID: generateID(),
-            citationItems: csl.map(({ id }) => ({ id })),
+            citationItems,
             // FIXME: remove this when citeproc fixes the bug
             properties: {},
         };
@@ -128,7 +134,7 @@ export class Processor {
         // "primes the pump" since citeproc currently runs synchronously
         await this.locales.fetch(locale);
         return {
-            retrieveItem: (id: string) => toJS(this.store.citations.CSL.get(id)!),
+            retrieveItem: (id: string): CSL.Data => toJS(this.store.citations.CSL.get(id)!),
             retrieveLocale: this.locales.retrieve,
         };
     }
diff --git a/src/js/dialogs/add/__tests__/manual-entry-container-test.tsx b/src/js/dialogs/add/__tests__/manual-entry-container-test.tsx
index a0b35cc4..1333f8b6 100644
--- a/src/js/dialogs/add/__tests__/manual-entry-container-test.tsx
+++ b/src/js/dialogs/add/__tests__/manual-entry-container-test.tsx
@@ -67,6 +67,10 @@ describe('<ManualEntryContainer />', () => {
         select.simulate('change', { currentTarget: { value: 'book' } });
         expect(mocks.onTypeChange).toHaveBeenCalledTimes(1);
     });
+    it('should not break when ref callback receives null', () => {
+        const { instance } = setup();
+        expect(() => instance.focusTypeSelect(null)).not.toThrow();
+    });
     describe('wheel event tests', () => {
         const { component } = setup({ fullMount: false });
         const wheelDiv = component.find('.bounded-rect');
diff --git a/src/js/dialogs/add/autocite.tsx b/src/js/dialogs/add/autocite.tsx
index e31508e9..3119f364 100644
--- a/src/js/dialogs/add/autocite.tsx
+++ b/src/js/dialogs/add/autocite.tsx
@@ -31,20 +31,20 @@ export default class AutoCite extends React.Component<Props> {
     query = observable('');
 
     @action
-    handleAutociteFieldChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    handleAutociteFieldChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.query.set(e.currentTarget.value);
     };
 
     @action
-    handleQuery = () => {
+    handleQuery = (): void => {
         if (this.query.get().length === 0 || !this.input.validity.valid) return;
         this.props.getter(this.props.kind, this.query.get());
         this.query.set('');
     };
 
-    bindRefs = (c: HTMLInputElement) => (this.input = c);
+    bindRefs = (c: HTMLInputElement): HTMLInputElement => (this.input = c);
 
-    handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>): void => {
         if (e.key === 'Enter' || e.key === 'Return') {
             e.stopPropagation();
             e.preventDefault();
@@ -52,7 +52,7 @@ export default class AutoCite extends React.Component<Props> {
         }
     };
 
-    render() {
+    render(): JSX.Element {
         const { placeholder, kind } = this.props;
         return (
             <div>
diff --git a/src/js/dialogs/add/button-row.tsx b/src/js/dialogs/add/button-row.tsx
index 275a9caa..f99c9f98 100644
--- a/src/js/dialogs/add/button-row.tsx
+++ b/src/js/dialogs/add/button-row.tsx
@@ -25,7 +25,7 @@ interface Props {
 @observer
 export default class ButtonRow extends React.Component<Props> {
     static readonly labels = top.ABT.i18n.dialogs.add.buttonRow;
-    render() {
+    render(): JSX.Element {
         const {
             addManually,
             attachInline,
diff --git a/src/js/dialogs/add/identifier-input.tsx b/src/js/dialogs/add/identifier-input.tsx
index a8f9ddcd..99c09c55 100644
--- a/src/js/dialogs/add/identifier-input.tsx
+++ b/src/js/dialogs/add/identifier-input.tsx
@@ -15,7 +15,7 @@ interface Props {
 export default class IdentifierInput extends React.Component<Props> {
     static readonly labels = top.ABT.i18n.dialogs.add.identifierInput;
 
-    render() {
+    render(): JSX.Element {
         return (
             <div>
                 <label htmlFor="identifierList" children={IdentifierInput.labels.label} />
diff --git a/src/js/dialogs/add/index.tsx b/src/js/dialogs/add/index.tsx
index 6ac710d1..ec61a652 100644
--- a/src/js/dialogs/add/index.tsx
+++ b/src/js/dialogs/add/index.tsx
@@ -25,6 +25,14 @@ interface URLMeta extends IURLMeta {
     kind: 'webpage';
 }
 type AutoCiteMeta = BookMeta | URLMeta;
+type ManualData = { [k in keyof CSL.Data]: any };
+interface Payload {
+    addManually: boolean;
+    attachInline: boolean;
+    identifierList: string;
+    manualData: ManualData;
+    people: ABT.TypedPerson[];
+}
 
 @observer
 export default class AddDialog extends React.Component<DialogProps> {
@@ -58,18 +66,18 @@ export default class AddDialog extends React.Component<DialogProps> {
     people = observable<ABT.TypedPerson>([{ family: '', given: '', type: 'author' }]);
 
     @computed
-    get payload() {
+    get payload(): Payload {
         return {
-            addManually: toJS(this.addManually),
-            attachInline: toJS(this.attachInline),
-            identifierList: toJS(this.identifierList),
-            manualData: toJS(this.manualData),
+            addManually: this.addManually.get(),
+            attachInline: this.attachInline.get(),
+            identifierList: this.identifierList.get(),
+            manualData: toJS(this.manualData as any) as ManualData,
             people: this.people.slice(),
         };
     }
 
     @action
-    appendPMID = (pmid: string) => {
+    appendPMID = (pmid: string): void => {
         const ids = new Set(
             this.identifierList
                 .get()
@@ -84,7 +92,7 @@ export default class AddDialog extends React.Component<DialogProps> {
     };
 
     @action
-    autocite = (meta: AutoCiteMeta) => {
+    autocite = (meta: AutoCiteMeta): void => {
         switch (meta.kind) {
             case 'webpage':
                 this.manualData.merge({
@@ -127,57 +135,57 @@ export default class AddDialog extends React.Component<DialogProps> {
     };
 
     @action
-    changeIdentifiers = (e: React.FormEvent<HTMLInputElement>) => {
+    changeIdentifiers = (e: React.FormEvent<HTMLInputElement>): void => {
         this.identifierList.set(e.currentTarget.value);
     };
 
     @action
-    changeType = (citationType: CSL.ItemType) => {
+    changeType = (citationType: CSL.ItemType): void => {
         this.manualData.clear();
         this.manualData.set('type', citationType);
         this.people.replace([{ family: '', given: '', type: 'author' }]);
     };
 
     @action
-    closePubmedDialog = () => {
+    closePubmedDialog = (): void => {
         this.props.focusTrapPaused!.set(false);
     };
 
     @action
-    openPubmedDialog = () => {
+    openPubmedDialog = (): void => {
         this.props.focusTrapPaused!.set(true);
         this.currentDialog.set('PUBMED');
     };
 
     @action
-    setErrorMessage = (msg?: string) => {
+    setErrorMessage = (msg?: string): void => {
         this.errorMessage.set(msg || '');
     };
 
     @action
-    toggleAddManual = () => {
+    toggleAddManual = (): void => {
         this.addManually.set(!this.addManually.get());
         this.people.replace([{ family: '', given: '', type: 'author' }]);
         this.changeType('webpage');
     };
 
     @action
-    toggleAttachInline = () => {
+    toggleAttachInline = (): void => {
         this.attachInline.set(!this.attachInline.get());
     };
 
     @action
-    toggleLoadingState = (state?: boolean) => {
+    toggleLoadingState = (state?: boolean): void => {
         const loadingState: boolean = state ? state : !this.isLoading.get();
         this.isLoading.set(loadingState);
     };
 
-    captureInputField = (el: HTMLInputElement | null) => {
+    captureInputField = (el: HTMLInputElement | null): void => {
         this.identifierInputField = el;
         if (el) el.focus();
     };
 
-    handleAutocite = async (kind: AutociteKind, query: string) => {
+    handleAutocite = async (kind: AutociteKind, query: string): Promise<void> => {
         this.toggleLoadingState();
         try {
             switch (kind) {
@@ -199,12 +207,12 @@ export default class AddDialog extends React.Component<DialogProps> {
         this.toggleLoadingState();
     };
 
-    handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    handleSubmit = (e: React.FormEvent<HTMLFormElement>): void => {
         e.preventDefault();
         this.props.onSubmit(this.payload);
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <div>
                 {this.isLoading.get() && <Spinner size="40px" overlay />}
diff --git a/src/js/dialogs/add/manual-entry-container.tsx b/src/js/dialogs/add/manual-entry-container.tsx
index 635e4b6e..c286fa25 100644
--- a/src/js/dialogs/add/manual-entry-container.tsx
+++ b/src/js/dialogs/add/manual-entry-container.tsx
@@ -25,17 +25,17 @@ export default class ManualEntryContainer extends React.Component<ManualEntryPro
     static readonly labels = top.ABT.i18n.dialogs.add.manualEntryContainer;
 
     @action
-    dismissError = () => {
+    dismissError = (): void => {
         this.props.errorMessage.set('');
     };
 
-    focusTypeSelect = (e: HTMLSelectElement | null) => e && e.focus();
+    focusTypeSelect = (e: HTMLSelectElement | null): void => (e ? e.focus() : void 0);
 
-    handleTypeChange = (e: React.FormEvent<HTMLSelectElement>) => {
+    handleTypeChange = (e: React.FormEvent<HTMLSelectElement>): void => {
         this.props.onTypeChange(e.currentTarget.value as CSL.ItemType);
     };
 
-    handleWheel = (e: React.WheelEvent<HTMLDivElement>) => {
+    handleWheel = (e: React.WheelEvent<HTMLDivElement>): void => {
         const isScrollingDown = e.deltaY > 0;
         const isScrollingUp = !isScrollingDown;
         const isScrollable = e.currentTarget.scrollHeight > e.currentTarget.clientHeight;
@@ -53,7 +53,7 @@ export default class ManualEntryContainer extends React.Component<ManualEntryPro
         }
     };
 
-    render() {
+    render(): JSX.Element {
         const itemType: string = this.props.manualData.get('type')!;
         const renderAutocite: boolean = ['webpage', 'book', 'chapter'].includes(itemType);
         return (
diff --git a/src/js/dialogs/add/meta-fields.tsx b/src/js/dialogs/add/meta-fields.tsx
index f261faee..c31fc03c 100644
--- a/src/js/dialogs/add/meta-fields.tsx
+++ b/src/js/dialogs/add/meta-fields.tsx
@@ -12,11 +12,11 @@ export default class MetaFields extends React.Component<MetaFieldProps, {}> {
     static readonly fieldmaps = top.ABT.i18n.fieldmaps;
 
     @action
-    updateField = (e: React.FormEvent<HTMLInputElement>) => {
+    updateField = (e: React.FormEvent<HTMLInputElement>): void => {
         this.props.meta.set(e.currentTarget.id, e.currentTarget.value);
     };
 
-    render() {
+    render(): JSX.Element {
         const citationType = this.props.meta.get('type')! as keyof ABT.FieldMappings;
         const title = MetaFields.fieldmaps[citationType].title;
         const fields = MetaFields.fieldmaps[citationType].fields;
@@ -59,7 +59,7 @@ interface FieldProps {
 
 @observer
 class Field extends React.Component<FieldProps, {}> {
-    render() {
+    render(): JSX.Element {
         const { onChange, field, meta } = this.props;
         return (
             <div className="table__row">
diff --git a/src/js/dialogs/add/people.tsx b/src/js/dialogs/add/people.tsx
index 6bd48259..94a97857 100644
--- a/src/js/dialogs/add/people.tsx
+++ b/src/js/dialogs/add/people.tsx
@@ -15,25 +15,25 @@ export default class People extends React.Component<PeopleProps, {}> {
     static readonly labels = top.ABT.i18n.dialogs.add.people;
 
     @action
-    addPerson = () => {
+    addPerson = (): void => {
         this.props.people.push({ family: '', given: '', type: 'author' });
     };
 
     @action
-    removePerson = (e: React.MouseEvent<HTMLInputElement>) => {
+    removePerson = (e: React.MouseEvent<HTMLInputElement>): void => {
         const index = parseInt(e.currentTarget.getAttribute('data-index')!, 10);
         this.props.people.remove(this.props.people[index]);
     };
 
     @action
-    updatePerson = (e: React.FormEvent<HTMLInputElement | HTMLSelectElement>) => {
+    updatePerson = (e: React.FormEvent<HTMLInputElement | HTMLSelectElement>): void => {
         const index = parseInt(e.currentTarget.getAttribute('data-index')!, 10);
         const field = e.currentTarget.getAttribute('data-field')! as keyof CSL.Person;
         const value = e.currentTarget.value;
         this.props.people[index][field] = value;
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <div>
                 <h2 children={People.labels.contributors} />
@@ -80,7 +80,7 @@ interface PersonProps {
 @observer
 class Person extends React.Component<PersonProps, {}> {
     static readonly labels = top.ABT.i18n.dialogs.add.people;
-    render() {
+    render(): JSX.Element {
         const { index, fieldMap: { people }, onChange, onRemove, person } = this.props;
         return (
             <div>
diff --git a/src/js/dialogs/container.tsx b/src/js/dialogs/container.tsx
index ac5a42e3..b1f2c86d 100644
--- a/src/js/dialogs/container.tsx
+++ b/src/js/dialogs/container.tsx
@@ -26,20 +26,20 @@ export default class Container extends React.Component<Props> {
     static defaultProps: Partial<Props> = {
         overlayOpacity: 0.7,
         width: 600,
-        onClose: () => void 0,
+        onClose: (): void => void 0,
     };
 
     /** Controls paused state of `FocusTrap`. Needed if nesting `FocusTrap`s */
     focusTrapPaused = observable(false);
 
     @action
-    close = (e?: React.MouseEvent<HTMLButtonElement>) => {
+    close = (e?: React.MouseEvent<HTMLButtonElement>): void => {
         if (e) e.preventDefault();
         this.props.currentDialog.set('');
         this.props.onClose!();
     };
 
-    handleKeyEvent = (e: React.KeyboardEvent<HTMLDivElement>) => {
+    handleKeyEvent = (e: React.KeyboardEvent<HTMLDivElement>): void => {
         switch (e.key) {
             case 'Escape':
                 e.stopPropagation();
@@ -49,13 +49,13 @@ export default class Container extends React.Component<Props> {
         }
     };
 
-    preventScrollPropagation = (e: React.WheelEvent<HTMLDivElement>) => {
+    preventScrollPropagation = (e: React.WheelEvent<HTMLDivElement>): void => {
         if (e.cancelable) {
             e.preventDefault();
         }
     };
 
-    render() {
+    render(): JSX.Element {
         const overlayStyle = {
             background: `rgba(0, 0, 0, ${this.props.overlayOpacity})`,
         };
diff --git a/src/js/dialogs/edit/index.tsx b/src/js/dialogs/edit/index.tsx
index cddd3174..81818b8d 100644
--- a/src/js/dialogs/edit/index.tsx
+++ b/src/js/dialogs/edit/index.tsx
@@ -65,7 +65,7 @@ export default class EditDialog extends React.Component<Props> {
         }
     }
 
-    handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    handleSubmit = (e: React.FormEvent<HTMLFormElement>): void => {
         e.preventDefault();
         const people = toJS(this.people);
         const fields = toJS<Partial<CSL.Data>>(this.fields as any);
@@ -81,7 +81,7 @@ export default class EditDialog extends React.Component<Props> {
         this.props.onSubmit(fields);
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <form onSubmit={this.handleSubmit}>
                 <People
diff --git a/src/js/dialogs/import/index.tsx b/src/js/dialogs/import/index.tsx
index 7ef46a93..7519ec86 100644
--- a/src/js/dialogs/import/index.tsx
+++ b/src/js/dialogs/import/index.tsx
@@ -31,8 +31,8 @@ export default class ImportDialog extends React.Component<DialogProps> {
     payload = observable<CSL.Data>([]);
 
     @action
-    handleFileUpload = async (e: React.FormEvent<HTMLInputElement>) => {
-        return new Promise<void>(resolve => {
+    handleFileUpload = async (e: React.FormEvent<HTMLInputElement>): Promise<void> => {
+        return new Promise<void>((resolve): void => {
             const reader = new FileReader();
             const file = e.currentTarget.files![0];
             const fileExtension = file.name.toLowerCase().match(/\.(\w+$)/)
@@ -48,33 +48,35 @@ export default class ImportDialog extends React.Component<DialogProps> {
     };
 
     @action
-    setErrorMessage = (msg: any = '') => {
+    setErrorMessage = (msg: any = ''): void => {
         this.errorMessage.set(typeof msg === 'string' ? msg : '');
     };
 
     @action
-    setFile = ({ name = '', value = '' } = {}) => {
+    setFile = ({ name = '', value = '' } = {}): void => {
         this.file.name.set(name);
         this.file.value.set(value);
     };
 
     @action
-    setPayload = (payload: CSL.Data[]) => {
+    setPayload = (payload: CSL.Data[]): void => {
         this.payload.replace(payload);
     };
 
-    bindRefs = (c: HTMLInputElement) => (this.inputField = c);
+    bindRefs = (c: HTMLInputElement): void => {
+        this.inputField = c;
+    };
 
-    handleClick = () => {
+    handleClick = (): void => {
         this.inputField.click();
     };
 
-    handleSubmit = (e: React.MouseEvent<HTMLInputElement>) => {
+    handleSubmit = (e: React.MouseEvent<HTMLInputElement>): void => {
         e.preventDefault();
         this.props.onSubmit(toJS(this.payload));
     };
 
-    parseFile = (reader: FileReader, fileExtension: string) => {
+    parseFile = (reader: FileReader, fileExtension: string): void => {
         let payload: CSL.Data[];
         try {
             switch (fileExtension) {
@@ -105,7 +107,7 @@ export default class ImportDialog extends React.Component<DialogProps> {
         this.setPayload(payload);
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <div id="import-dialog-root">
                 <div className="import-dialog">
diff --git a/src/js/dialogs/index.tsx b/src/js/dialogs/index.tsx
index e9bc41db..f66d891f 100644
--- a/src/js/dialogs/index.tsx
+++ b/src/js/dialogs/index.tsx
@@ -27,7 +27,7 @@ interface Props extends DialogProps {
 @observer
 export default class DialogRouter extends React.Component<Props> {
     static labels = top.ABT.i18n.dialogs;
-    render() {
+    render(): JSX.Element | null {
         const { currentDialog, data, onSubmit } = this.props;
         switch (currentDialog.get()) {
             case DialogType.ADD:
diff --git a/src/js/dialogs/pubmed/index.tsx b/src/js/dialogs/pubmed/index.tsx
index cfbda857..90beaf71 100644
--- a/src/js/dialogs/pubmed/index.tsx
+++ b/src/js/dialogs/pubmed/index.tsx
@@ -36,7 +36,7 @@ export default class PubmedDialog extends React.Component<DialogProps> {
     results = observable<CSL.Data>([]);
 
     @computed
-    get visibleResults() {
+    get visibleResults(): CSL.Data[] {
         const end = this.page.get() * 5;
         const start = end - 6;
         return this.results.filter((_result, i) => {
@@ -45,23 +45,23 @@ export default class PubmedDialog extends React.Component<DialogProps> {
     }
 
     @action
-    setError = (msg: string | React.MouseEvent<HTMLDivElement> = '') => {
+    setError = (msg: string | React.MouseEvent<HTMLDivElement> = ''): void => {
         this.errorMessage.set(typeof msg === 'string' ? msg : '');
     };
 
     @action
-    toggleLoading = (state?: boolean) => {
+    toggleLoading = (state?: boolean): void => {
         return state === undefined
             ? this.isLoading.set(!this.isLoading.get())
             : this.isLoading.set(state);
     };
 
     @action
-    updateQuery = (e?: React.FormEvent<HTMLInputElement>) => {
+    updateQuery = (e?: React.FormEvent<HTMLInputElement>): void => {
         this.query.set(e ? e.currentTarget.value : '');
     };
 
-    sendQuery = async (e: React.FormEvent<HTMLFormElement>) => {
+    sendQuery = async (e: React.FormEvent<HTMLFormElement>): Promise<void> => {
         e.preventDefault();
         this.toggleLoading(true);
         try {
@@ -81,7 +81,7 @@ export default class PubmedDialog extends React.Component<DialogProps> {
         this.toggleLoading(false);
     };
 
-    render() {
+    render(): JSX.Element {
         if (this.isLoading.get()) {
             return <Spinner size="40px" height="52px" bgColor="rgba(0, 0, 0, 0.05)" />;
         }
@@ -140,7 +140,7 @@ export default class PubmedDialog extends React.Component<DialogProps> {
     }
 }
 
-export function* placeholderGenerator() {
+export function* placeholderGenerator(): IterableIterator<string> {
     const options = [
         'Ioannidis JP[Author - First] AND meta research',
         'Brohi K[Author - First] AND "acute traumatic coagulopathy"',
diff --git a/src/js/dialogs/pubmed/paginate.tsx b/src/js/dialogs/pubmed/paginate.tsx
index 8981d5fa..e3590a0f 100644
--- a/src/js/dialogs/pubmed/paginate.tsx
+++ b/src/js/dialogs/pubmed/paginate.tsx
@@ -18,7 +18,7 @@ export class Paginate extends React.Component<Props> {
     static readonly labels = top.ABT.i18n.dialogs.pubmed;
 
     @action
-    handleClick = (e: React.MouseEvent<HTMLInputElement>) => {
+    handleClick = (e: React.MouseEvent<HTMLInputElement>): void => {
         switch (e.currentTarget.id) {
             case 'next':
                 return this.props.page.set(this.props.page.get() + 1);
@@ -29,7 +29,7 @@ export class Paginate extends React.Component<Props> {
         }
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <div>
                 <Button
diff --git a/src/js/dialogs/pubmed/result-list.tsx b/src/js/dialogs/pubmed/result-list.tsx
index a88d76d1..15c2f2af 100644
--- a/src/js/dialogs/pubmed/result-list.tsx
+++ b/src/js/dialogs/pubmed/result-list.tsx
@@ -20,19 +20,19 @@ export class ResultList extends React.Component<ResultListProps, {}> {
     /** Required so that result list can be scrolled to top after each new search */
     element: HTMLElement;
 
-    bindRefs = (c: HTMLDivElement) => {
+    bindRefs = (c: HTMLDivElement): void => {
         this.element = c;
     };
 
-    componentDidUpdate() {
+    componentDidUpdate(): void {
         this.element.scrollTop = 0;
     }
 
-    handleClick = (e: React.MouseEvent<HTMLInputElement>) => {
+    handleClick = (e: React.MouseEvent<HTMLInputElement>): void => {
         this.props.onSelect(e.currentTarget.id);
     };
 
-    handleWheel = (e: React.WheelEvent<HTMLDivElement>) => {
+    handleWheel = (e: React.WheelEvent<HTMLDivElement>): void => {
         const isScrollingDown = e.deltaY > 0;
         const isScrollingUp = !isScrollingDown;
         const isScrollable = e.currentTarget.scrollHeight > e.currentTarget.clientHeight;
@@ -50,7 +50,7 @@ export class ResultList extends React.Component<ResultListProps, {}> {
         }
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <div className="result-list" ref={this.bindRefs} onWheel={this.handleWheel}>
                 {this.props.results.map(result => (
diff --git a/src/js/drivers/tinymce.ts b/src/js/drivers/tinymce.ts
index 41f615bb..1335c74e 100644
--- a/src/js/drivers/tinymce.ts
+++ b/src/js/drivers/tinymce.ts
@@ -1,4 +1,4 @@
-import EditorDriver from './base';
+import EditorDriver, { RelativeCitationPositions } from './base';
 
 interface SelectionCache {
     bookmark: {
@@ -18,7 +18,7 @@ export default class TinyMCEDriver extends EditorDriver {
      * `MutationObserver` which watches and reacts to removals of individual
      * citation nodes.
      */
-    private editorCitationObserver = new MutationObserver(mutations => {
+    private editorCitationObserver = new MutationObserver((mutations): void => {
         for (const mutation of mutations) {
             for (const removedNode of Array.from(mutation.removedNodes)) {
                 if (removedNode.nodeName !== 'SPAN') {
@@ -52,7 +52,7 @@ export default class TinyMCEDriver extends EditorDriver {
         bookmark: { rng: document.createRange() },
     };
 
-    get citationIds() {
+    get citationIds(): string[] {
         const citations = this.editor
             .getDoc()
             .querySelectorAll(`*:not(.mce-offscreen-selection) > .${EditorDriver.citationClass}`);
@@ -97,7 +97,7 @@ export default class TinyMCEDriver extends EditorDriver {
         );
     }
 
-    get relativeCitationPositions() {
+    get relativeCitationPositions(): RelativeCitationPositions {
         const doc = this.editor.getDoc();
         const bm = this.selectionCache.fresh
             ? this.selectionCache.bookmark
@@ -138,13 +138,13 @@ export default class TinyMCEDriver extends EditorDriver {
         );
     }
 
-    get selection() {
+    get selection(): string {
         return this.selectionCache.fresh
             ? this.selectionCache.selection
             : this.editor.selection.getContent({ format: 'html' });
     }
 
-    alert(message: string) {
+    alert(message: string): void {
         this.editor.windowManager.alert(message);
     }
 
@@ -152,7 +152,7 @@ export default class TinyMCEDriver extends EditorDriver {
         clusters: Citeproc.CitationResult[],
         citationByIndex: Citeproc.CitationByIndex,
         kind: Citeproc.CitationKind,
-    ) {
+    ): void {
         this.editor.focus();
         const doc = this.editor.getDoc();
         const oldElements = doc.querySelectorAll(`
@@ -192,8 +192,8 @@ export default class TinyMCEDriver extends EditorDriver {
         return kind === 'note' ? this.composeFootnotes() : void 0;
     }
 
-    async init() {
-        return new Promise<void>((resolve, reject) => {
+    async init(): Promise<void> {
+        return new Promise<void>((resolve, reject): void => {
             let attempts = 0;
             let interval = setInterval(() => {
                 if (top.tinyMCE === undefined) {
@@ -233,7 +233,7 @@ export default class TinyMCEDriver extends EditorDriver {
         });
     }
 
-    removeItems(itemIds: string[]) {
+    removeItems(itemIds: string[]): void {
         const doc = this.editor.getDoc();
         for (const id of itemIds) {
             const item = doc.getElementById(id);
@@ -243,7 +243,7 @@ export default class TinyMCEDriver extends EditorDriver {
         }
     }
 
-    reset() {
+    reset(): void {
         const elements = this.editor
             .getDoc()
             .querySelectorAll(`#${EditorDriver.bibliographyId}, .${EditorDriver.citationClass}`);
@@ -260,17 +260,17 @@ export default class TinyMCEDriver extends EditorDriver {
         options: ABT.BibOptions,
         bibliography: ABT.Bibliography | boolean,
         staticBib: boolean = false,
-    ) {
+    ): void {
         return staticBib
             ? this.setStaticBibliography(bibliography)
             : this.setStandardBibliography(options, bibliography);
     }
 
-    setLoadingState(loading?: boolean) {
+    setLoadingState(loading?: boolean): void {
         this.editor.setProgressState(loading || false);
     }
 
-    protected bindEvents() {
+    protected bindEvents(): void {
         this.editor.on('focusin', () => {
             this.selectionCache = { ...this.selectionCache, fresh: false };
         });
@@ -302,7 +302,7 @@ export default class TinyMCEDriver extends EditorDriver {
         });
     }
 
-    private composeFootnotes() {
+    private composeFootnotes(): void {
         const doc = this.editor.getDoc();
         const orderedFootnotes = [
             ...doc.querySelectorAll(`.${EditorDriver.citationClass}`).entries(),
@@ -332,7 +332,7 @@ export default class TinyMCEDriver extends EditorDriver {
     private setStandardBibliography(
         options: ABT.BibOptions,
         bibliography: ABT.Bibliography | boolean,
-    ) {
+    ): void {
         if (typeof bibliography === 'boolean' || bibliography.length === 0) return;
 
         const bib = EditorDriver.createBibliographyElement(options, bibliography, [
@@ -347,7 +347,7 @@ export default class TinyMCEDriver extends EditorDriver {
         this.editor.selection.moveToBookmark(bookmark);
     }
 
-    private setStaticBibliography(bibliography: ABT.Bibliography | boolean) {
+    private setStaticBibliography(bibliography: ABT.Bibliography | boolean): void {
         const items: ABT.Bibliography = typeof bibliography === 'boolean' ? [] : bibliography;
         const staticBib = EditorDriver.createBibliographyElement({}, items, [
             `${EditorDriver.staticBibClass}`,
diff --git a/src/js/frontend.ts b/src/js/frontend.ts
index 0b1a5af7..9da5c417 100644
--- a/src/js/frontend.ts
+++ b/src/js/frontend.ts
@@ -5,7 +5,7 @@ jQuery(document).ready(() => {
 type HeadingLevel = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 
 // tslint:disable-next-line cyclomatic-complexity
-export function createTooltip(e: MouseEvent) {
+export function createTooltip(e: MouseEvent): void {
     const citation = <HTMLSpanElement>e.currentTarget;
     const existingTooltip = document.getElementById('abt-tooltip');
     if (existingTooltip) {
diff --git a/src/js/reference-list/__tests__/__snapshots__/api-test.ts.snap b/src/js/reference-list/__tests__/__snapshots__/api-test.ts.snap
new file mode 100644
index 00000000..2bcec360
--- /dev/null
+++ b/src/js/reference-list/__tests__/__snapshots__/api-test.ts.snap
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`parseManualData() should parse a basic set of manual data 1`] = `
+Array [
+  Array [
+    Object {
+      "author": Array [
+        Object {
+          "family": "Doe",
+          "given": "John",
+        },
+        Object {
+          "family": "Smith",
+          "given": "Jane",
+        },
+      ],
+      "id": "2894571532",
+      "title": "Test title",
+      "type": "article-journal",
+    },
+  ],
+  "",
+]
+`;
diff --git a/src/js/reference-list/__tests__/api-test.ts b/src/js/reference-list/__tests__/api-test.ts
index c9903132..b65eb16e 100644
--- a/src/js/reference-list/__tests__/api-test.ts
+++ b/src/js/reference-list/__tests__/api-test.ts
@@ -45,19 +45,8 @@ describe('parseManualData()', () => {
         };
     });
     it('should parse a basic set of manual data', () => {
-        const expected = [
-            [
-                {
-                    author: [{ family: 'Doe', given: 'John' }, { family: 'Smith', given: 'Jane' }],
-                    id: '12345',
-                    title: 'Test title',
-                    type: 'article-journal',
-                },
-            ],
-            '',
-        ];
         const actual = parseManualData(data);
-        expect(actual).toEqual(expected);
+        expect(actual).toMatchSnapshot();
     });
     it('should generate an ID if one doesnt exist', () => {
         delete data.manualData.id;
diff --git a/src/js/reference-list/__tests__/store-test.ts b/src/js/reference-list/__tests__/store-test.ts
index 38ef34b1..e6a37c01 100644
--- a/src/js/reference-list/__tests__/store-test.ts
+++ b/src/js/reference-list/__tests__/store-test.ts
@@ -46,27 +46,6 @@ describe('Store', () => {
             );
             expect(store.citations.CSL.get('aaaaaaaa')!.language).toBe('en-US');
         });
-        it('should intercept a citation already defined', () => {
-            const cite: Partial<CSL.Data> = {
-                PMID: '12345',
-                title: 'Test Title',
-                type: 'article-journal',
-            };
-            const cite2: Partial<CSL.Data> = {
-                PMID: '12345',
-                title: 'Test Title',
-                type: 'article-journal',
-            };
-            store.citations.CSL.set('sameCitation', <any>cite);
-            store.citations.CSL.set('sameCitationAgain', <any>cite2);
-            expect(store.citations.CSL.keys().length).toBe(3);
-        });
-        it('should intercept a citation that has no title set', () => {
-            expect(store.citations.CSL.keys().length).toBe(3);
-            const invalidCSL: Partial<CSL.Data> = { PMID: '11223344', type: 'article-journal' };
-            store.citations.CSL.set('invalidCSL', <any>invalidCSL);
-            expect(store.citations.CSL.keys().length).toBe(3);
-        });
         it('should allow non-existing CSL to be set', () => {
             const cite = JSON.parse(JSON.stringify(store.citations.CSL.get('aaaaaaaa')));
             cite.title = 'Something different';
diff --git a/src/js/reference-list/api.ts b/src/js/reference-list/api.ts
index 2f780cee..2ccd461a 100644
--- a/src/js/reference-list/api.ts
+++ b/src/js/reference-list/api.ts
@@ -1,5 +1,5 @@
 import { parseDate } from 'astrocite-core';
-import { generateID } from 'utils/helpers/';
+import * as hash from 'string-hash';
 import { getFromDOI, getFromPubmed } from 'utils/resolvers/';
 
 export async function getRemoteData(identifierList: string): Promise<[CSL.Data[], string]> {
@@ -43,6 +43,7 @@ export async function getRemoteData(identifierList: string): Promise<[CSL.Data[]
     const data = await Promise.all(promises);
     const [csl, errs] = data.reduce(
         ([prevCSL, prevErr], [currCSL, currErr]) => {
+            currCSL = currCSL.map(item => ({ ...item, id: `${hash(JSON.stringify(item))}` }));
             return [[...prevCSL, ...currCSL], [...prevErr, ...currErr]];
         },
         [[], [...errList]],
@@ -57,32 +58,34 @@ export async function getRemoteData(identifierList: string): Promise<[CSL.Data[]
 }
 
 export function parseManualData(data: ABT.ManualData): [CSL.Data[], string] {
-    data.people.forEach(person => {
-        if (data.manualData[person.type] === undefined) {
-            data.manualData[person.type] = [{ family: person.family, given: person.given }];
-            return;
-        }
-        data.manualData[person.type]!.push({
-            family: person.family,
-            given: person.given,
-        });
-    });
-
-    // Process date fields
-    ['accessed', 'event-date', 'issued'].forEach((dateType: keyof CSL.Data) => {
-        if (!data.manualData[dateType]) return;
-        data.manualData[dateType] = <any>parseDate(<string>data.manualData[dateType]);
-    });
-
-    // Create a unique ID if one doesn't exist
-    if (!data.manualData.id) data.manualData.id = generateID();
+    let csl: CSL.Data = data.people.reduce(
+        (item, person) => {
+            const value = [{ family: person.family, given: person.given }];
+            return !item[person.type]
+                ? { ...item, [person.type]: value }
+                : { ...item, [person.type]: [...item[person.type]!, ...value] };
+        },
+        { ...data.manualData },
+    );
 
-    Object.keys(data.manualData).forEach((key: keyof CSL.Data) => {
-        if (data.manualData[key] === '') {
-            delete data.manualData[key];
-            return;
-        }
-    });
+    csl = Object.keys(csl).reduce(
+        (prev, curr: keyof CSL.Data) => {
+            if (!csl[curr]) {
+                return prev;
+            }
+            if (['accessed', 'event-date', 'issued'].includes(curr)) {
+                return {
+                    ...prev,
+                    [curr]: parseDate(<string>csl[curr]),
+                };
+            }
+            return {
+                ...prev,
+                [curr]: csl[curr],
+            };
+        },
+        <CSL.Data>{},
+    );
 
-    return [[data.manualData], ''];
+    return [[{ ...csl, id: `${hash(JSON.stringify(csl))}` }], ''];
 }
diff --git a/src/js/reference-list/components/card.tsx b/src/js/reference-list/components/card.tsx
index ed9b0b6c..14f2f2ca 100644
--- a/src/js/reference-list/components/card.tsx
+++ b/src/js/reference-list/components/card.tsx
@@ -24,19 +24,19 @@ export default class Card extends React.Component<CardProps> {
     timer: NodeJS.Timer;
 
     @action
-    hideIndex = () => {
+    hideIndex = (): void => {
         clearTimeout(this.timer);
         this.isShowingIndex.set(false);
     };
 
     @action
-    showIndex = () => {
+    showIndex = (): void => {
         this.timer = setTimeout(() => {
             runInAction(() => this.isShowingIndex.set(true));
         }, 500) as any;
     };
 
-    render() {
+    render(): JSX.Element {
         const { CSL, indexOnHover, isSelected } = this.props;
         return (
             <div
diff --git a/src/js/reference-list/components/item-list.tsx b/src/js/reference-list/components/item-list.tsx
index f5208b8a..4ae33aa9 100644
--- a/src/js/reference-list/components/item-list.tsx
+++ b/src/js/reference-list/components/item-list.tsx
@@ -32,24 +32,24 @@ interface Props {
 @observer
 export default class ItemList extends React.Component<Props> {
     @action
-    doubleClick = () => {
+    doubleClick = (): void => {
         this.props.ui.cited.isOpen.set(false);
         this.props.ui.uncited.isOpen.set(false);
         this.props.ui[this.props.id].isOpen.set(true);
     };
 
     @action
-    singleClick = () => {
+    singleClick = (): void => {
         this.props.ui[this.props.id].isOpen.set(!this.props.ui[this.props.id].isOpen.get());
     };
 
     @action
-    toggleSelect = (e: React.MouseEvent<HTMLDivElement>) => {
+    toggleSelect = (e: React.MouseEvent<HTMLDivElement>): void => {
         this.props.selectedItems.remove(e.currentTarget.id) ||
             this.props.selectedItems.push(e.currentTarget.id);
     };
 
-    render() {
+    render(): JSX.Element | null {
         const { CSL, children, id, items, onEditReference, selectedItems, ui } = this.props;
         if (!items || items.length === 0) return null;
         return (
@@ -110,12 +110,12 @@ interface ItemsProps extends React.HTMLProps<HTMLElement> {
 @observer
 export class Items extends React.Component<ItemsProps, {}> {
     @action
-    editSingleReference = (e: React.MouseEvent<HTMLDivElement>) => {
+    editSingleReference = (e: React.MouseEvent<HTMLDivElement>): void => {
         const referenceId = e.currentTarget.id;
         this.props.onEditReference(referenceId);
     };
 
-    handleScroll = (e: React.WheelEvent<HTMLDivElement>) => {
+    handleScroll = (e: React.WheelEvent<HTMLDivElement>): void => {
         e.stopPropagation();
         const atTopAndScrollingUp: boolean = e.currentTarget.scrollTop === 0 && e.deltaY < 0;
         const atBottomAndScollingDown: boolean =
@@ -126,7 +126,7 @@ export class Items extends React.Component<ItemsProps, {}> {
         }
     };
 
-    render() {
+    render(): JSX.Element {
         return (
             <div
                 onWheel={this.handleScroll}
diff --git a/src/js/reference-list/components/menu.tsx b/src/js/reference-list/components/menu.tsx
index 743e0ce2..8d237a19 100644
--- a/src/js/reference-list/components/menu.tsx
+++ b/src/js/reference-list/components/menu.tsx
@@ -58,14 +58,14 @@ export default class Menu extends React.Component<Props> {
     static readonly labels = top.ABT.i18n.referenceList.menu;
     static filterOptions = filterOptions;
 
-    static willEnter() {
+    static willEnter(): { height: number; scale: number } {
         return {
             height: 0,
             scale: 0,
         };
     }
 
-    static willLeave() {
+    static willLeave(): any {
         return {
             height: spring(0, { stiffness: 300, damping: 25 }),
             scale: spring(0, { stiffness: 300, damping: 25 }),
@@ -75,7 +75,7 @@ export default class Menu extends React.Component<Props> {
     readonly styles: StyleOption[];
 
     @computed
-    get selected() {
+    get selected(): { label: string; value: string } {
         return {
             label: this.styles.find(d => d.id === this.props.cslStyle.get())!.label,
             value: this.props.cslStyle.get(),
@@ -107,11 +107,11 @@ export default class Menu extends React.Component<Props> {
     }
 
     @action
-    toggleMenu = () => {
+    toggleMenu = (): void => {
         this.props.isOpen.set(false);
     };
 
-    handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+    handleClick = (e: React.MouseEvent<HTMLButtonElement>): void => {
         this.toggleMenu();
         const menuAction: MenuAction = {
             kind: e.currentTarget.id as MenuButtonKind,
@@ -119,7 +119,7 @@ export default class Menu extends React.Component<Props> {
         this.props.onSubmit(menuAction);
     };
 
-    handleSelect = (data: StyleOption | never[]) => {
+    handleSelect = (data: StyleOption | never[]): void => {
         if (Array.isArray(data)) return;
         const menuAction: MenuAction = {
             kind: MenuActionType.CHANGE_STYLE,
@@ -129,7 +129,7 @@ export default class Menu extends React.Component<Props> {
         this.forceUpdate();
     };
 
-    render() {
+    render(): JSX.Element {
         const transitionStyle = this.props.isOpen.get() ? openedStyle : [];
         return (
             <TransitionMotion
@@ -137,7 +137,7 @@ export default class Menu extends React.Component<Props> {
                 willEnter={Menu.willEnter}
                 styles={transitionStyle}
             >
-                {styles =>
+                {(styles): any =>
                     styles.length > 0
                         ? (
                               <div
@@ -245,7 +245,7 @@ export default class Menu extends React.Component<Props> {
     }
 }
 
-export function dynamicOptionHeightHandler({ option }: { option: StyleOption }) {
+export function dynamicOptionHeightHandler({ option }: { option: StyleOption }): number {
     switch (true) {
         case option.label.length > 110:
             return 90;
@@ -285,7 +285,7 @@ export function renderer({
     option,
     selectValue,
     style,
-}: RendererParams) {
+}: RendererParams): JSX.Element {
     style.alignItems = 'center';
     style.fontWeight = 300;
     style.cursor = 'default';
@@ -325,8 +325,8 @@ export function renderer({
         style.backgroundColor = '#f5f5f5';
     }
 
-    const click = () => selectValue(option);
-    const focus = () => focusOption(option);
+    const click = (): void => selectValue(option);
+    const focus = (): void => focusOption(option);
 
     return (
         <div
diff --git a/src/js/reference-list/components/reference-list.tsx b/src/js/reference-list/components/reference-list.tsx
index d38f8e30..5e95ee80 100644
--- a/src/js/reference-list/components/reference-list.tsx
+++ b/src/js/reference-list/components/reference-list.tsx
@@ -116,7 +116,7 @@ export default class ReferenceList extends React.Component<Props> {
         });
     }
 
-    componentDidMount() {
+    componentDidMount(): void {
         addEventListener(EditorDriver.events.AVAILABLE, this.toggleLoading.bind(this, false));
         addEventListener(EditorDriver.events.UNAVAILABLE, this.toggleLoading.bind(this, true));
         addEventListener(EditorDriver.events.ADD_REFERENCE, this.openDialog.bind(this, 'ADD'));
@@ -131,7 +131,7 @@ export default class ReferenceList extends React.Component<Props> {
         document.addEventListener('scroll', this.handleScroll);
     }
 
-    componentWillUnmount() {
+    componentWillUnmount(): void {
         removeEventListener(EditorDriver.events.UNAVAILABLE, this.toggleLoading.bind(this, true));
         removeEventListener(EditorDriver.events.AVAILABLE, this.toggleLoading.bind(this, false));
         removeEventListener(EditorDriver.events.ADD_REFERENCE, this.openDialog.bind(this, 'ADD'));
@@ -146,7 +146,7 @@ export default class ReferenceList extends React.Component<Props> {
         document.removeEventListener('scroll', this.handleScroll);
     }
 
-    init = async () => {
+    init = async (): Promise<void> => {
         this.editor = await this.props.editor.then(driver => new driver());
         await this.editor.init();
         await this.initProcessor();
@@ -154,7 +154,7 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    addReferences = async (payload: any) => {
+    addReferences = async (payload: any): Promise<void> => {
         let data: CSL.Data[];
         let err: string;
         try {
@@ -176,17 +176,17 @@ export default class ReferenceList extends React.Component<Props> {
             return;
         }
         if (data.length === 0) return;
-        data = this.props.store.citations.addItems(data);
+        this.props.store.citations.addItems(data);
         return payload.attachInline ? this.insertInlineCitation(undefined, data) : void 0;
     };
 
     @action
-    clearSelection = () => {
+    clearSelection = (): void => {
         this.selected.clear();
     };
 
     @action
-    deleteCitations = () => {
+    deleteCitations = (): void => {
         if (this.selected.length === 0) return;
         this.editor.setLoadingState(true);
         const toRemove = this.props.store.citations.removeItems(this.selected.slice());
@@ -196,14 +196,14 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    editReference = (referenceId: string) => {
+    editReference = (referenceId: string): void => {
         const data = this.props.store.citations.CSL.get(referenceId)!;
         this.dialogProps.set(data);
         this.currentDialog.set(DialogType.EDIT);
     };
 
     @action
-    handleDialogSubmit = (data: any) => {
+    handleDialogSubmit = (data: any): void => {
         switch (this.currentDialog.get()) {
             case DialogType.ADD:
                 this.addReferences(data);
@@ -219,7 +219,7 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    handleMenuSelection = (menuAction: MenuAction) => {
+    handleMenuSelection = (menuAction: MenuAction): void => {
         switch (menuAction.kind) {
             case MenuActionType.CHANGE_STYLE:
                 this.props.store.setStyle(menuAction.data);
@@ -247,7 +247,7 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    openDialog = (e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement> | string) => {
+    openDialog = (e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement> | string): void => {
         if (typeof e === 'string') {
             return this.currentDialog.set(e);
         }
@@ -256,7 +256,7 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    reset = () => {
+    reset = (): void => {
         this.editor.setLoadingState(true);
         this.clearSelection();
         this.ui.uncited.isOpen.set(false);
@@ -267,21 +267,21 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    toggleLoading = (loadState?: boolean) => {
+    toggleLoading = (loadState?: boolean): void => {
         this.ui.loading.set(loadState !== undefined ? loadState : !this.ui.loading.get());
     };
 
     @action
-    toggleMenu = () => {
+    toggleMenu = (): void => {
         this.ui.menuOpen.set(!this.ui.menuOpen.get());
     };
 
     @action
-    togglePinned = () => {
+    togglePinned = (): void => {
         this.ui.pinned.set(!this.ui.pinned.get());
     };
 
-    initProcessor = async () => {
+    initProcessor = async (): Promise<void> => {
         this.editor.setLoadingState(true);
         try {
             const clusters = await this.processor.init();
@@ -308,7 +308,7 @@ export default class ReferenceList extends React.Component<Props> {
         this.editor.setLoadingState(false);
     };
 
-    render() {
+    render(): JSX.Element {
         if (this.ui.loading.get()) {
             return (
                 <div>
@@ -429,7 +429,7 @@ export default class ReferenceList extends React.Component<Props> {
     }
 
     // prettier-ignore
-    insertInlineCitation = (e?: React.MouseEvent<HTMLButtonElement>, d: CSL.Data[] | Event = []) => {
+    insertInlineCitation = (e?: React.MouseEvent<HTMLButtonElement>, d: CSL.Data[] | Event = []): void => {
         if (e) {
             e.preventDefault();
         }
@@ -480,7 +480,7 @@ export default class ReferenceList extends React.Component<Props> {
         this.clearSelection();
     };
 
-    insertStaticBibliography = async () => {
+    insertStaticBibliography = async (): Promise<void> => {
         let data: CSL.Data[] = this.selected.map(id => this.props.store.citations.CSL.get(id)!);
 
         const selectionHasReferences = this.editor.selection.match(
@@ -508,7 +508,7 @@ export default class ReferenceList extends React.Component<Props> {
     };
 
     @action
-    private handleScroll = () => {
+    private handleScroll = (): void => {
         const list = document.getElementById('abt-reflist')!;
 
         if (!this.ui.pinned.get()) {
@@ -585,7 +585,7 @@ export default class ReferenceList extends React.Component<Props> {
         this.ui.uncited.maxHeight.set(`${uncitedHeight}px`);
     };
 
-    private handleUndo = () => {
+    private handleUndo = (): void => {
         const citationsByIndex = this.editor.citationsByIndex.reduce(
             (prev, item) => {
                 const citationItems = item.citationItems.map(citation => ({
@@ -609,7 +609,7 @@ export default class ReferenceList extends React.Component<Props> {
 
 @observer
 export class StorageField extends React.Component<{ store: Store }> {
-    render() {
+    render(): JSX.Element {
         return <input type="hidden" name="abt-reflist-state" value={this.props.store.persistent} />;
     }
 }
diff --git a/src/js/reference-list/store.ts b/src/js/reference-list/store.ts
index 8ba27307..35603ce6 100644
--- a/src/js/reference-list/store.ts
+++ b/src/js/reference-list/store.ts
@@ -1,12 +1,4 @@
-import {
-    action,
-    computed,
-    intercept,
-    IObservableArray,
-    observable,
-    ObservableMap,
-    toJS,
-} from 'mobx';
+import { action, computed, IObservableArray, observable, ObservableMap, toJS } from 'mobx';
 import { localeMapper as locales } from 'utils/constants';
 
 class CitationStore {
@@ -16,36 +8,6 @@ class CitationStore {
     constructor(byIndex: Citeproc.CitationByIndex, CSL: { [id: string]: CSL.Data }) {
         this.byIndex = observable(byIndex);
         this.CSL = this.cleanCSL(CSL);
-        intercept(this.CSL, change => {
-            if (change.type !== 'add' || !change.newValue) {
-                return change;
-            }
-
-            if (!change.newValue.title) {
-                return null;
-            }
-
-            const title = change.newValue.title.toLowerCase();
-            const matchIndex: number = this.CSL.values().findIndex(v => {
-                return v.title !== undefined && v.title.toLowerCase() === title;
-            });
-
-            if (matchIndex > -1) {
-                const match = toJS(this.CSL.get(this.CSL.keys()[matchIndex]));
-                const deepMatch = Object.keys(change.newValue).every((k: keyof CSL.Data) => {
-                    const isComplexDataType =
-                        typeof change.newValue![k] !== 'string' &&
-                        typeof change.newValue![k] !== 'number';
-                    const isVariableKey = k === 'id' || k === 'language';
-                    return isComplexDataType || isVariableKey
-                        ? true
-                        : change.newValue![k] === match![k];
-                });
-                if (deepMatch) return null;
-            }
-
-            return change;
-        });
     }
 
     /**
@@ -56,9 +18,11 @@ class CitationStore {
         return this.CSL
             .keys()
             .reduce(
-                (prev, curr) => {
-                    if (!this.citedIDs.includes(curr)) prev.push(this.CSL.get(curr)!);
-                    return prev;
+                (data, currentId) => {
+                    if (!this.citedIDs.includes(currentId)) {
+                        data = [...data, this.CSL.get(currentId)!];
+                    }
+                    return data;
                 },
                 <CSL.Data[]>[],
             )
@@ -78,11 +42,14 @@ class CitationStore {
      */
     @computed
     get citedIDs(): string[] {
-        return this.citationByIndex
-            .map(i => i.citationItems.map(j => j.id))
-            .reduce((prev, curr) => [...prev, ...curr], [])
-            .reduce((p, c) => (!p.includes(c) ? [...p, c] : p), <string[]>[])
-            .slice();
+        return Array.from(
+            new Set(
+                this.byIndex
+                    .map(citation => citation.citationItems.map(item => item.id))
+                    .reduce((data, item) => data.concat(item), [])
+                    .slice(),
+            ),
+        );
     }
 
     /**
@@ -90,34 +57,20 @@ class CitationStore {
      * @param data - Array of CSL.Data to be merged
      */
     @action
-    addItems(data: CSL.Data[]): CSL.Data[] {
+    addItems(data: CSL.Data[]): void {
         this.CSL.merge(
             data.reduce(
-                (prev, curr) => {
-                    prev[curr.id] = curr;
-                    return prev;
-                },
+                (cslObj, item) => ({
+                    ...cslObj,
+                    [item.id]: item,
+                }),
                 <{ [id: string]: CSL.Data }>{},
             ),
         );
-        // This is necessary in case one of the values is a duplicate and gets
-        // intercepted.
-        let payload: CSL.Data[] = [];
-        for (const item of data) {
-            const csl = this.CSL.values().find(val => {
-                for (const key of Object.keys(item)) {
-                    if (typeof item[<keyof CSL.Data>key] === 'object' || key === 'id') continue;
-                    if (item[<keyof CSL.Data>key] !== val[<keyof CSL.Data>key]) return false;
-                }
-                return true;
-            });
-            payload = [...payload, toJS(csl!)];
-        }
-        return payload;
     }
 
     @action
-    init(byIndex: Citeproc.CitationByIndex) {
+    init(byIndex: Citeproc.CitationByIndex): void {
         this.byIndex.replace(JSON.parse(JSON.stringify(byIndex)));
     }
 
@@ -140,9 +93,12 @@ class CitationStore {
      */
     @action
     removeItems(idList: string[]): string[] {
-        idList.forEach(id => {
-            if (!this.citedIDs.includes(id)) this.CSL.delete(id);
-        });
+        const citedIDs = this.citedIDs;
+        for (const id of idList) {
+            if (!citedIDs.includes(id)) {
+                this.CSL.delete(id);
+            }
+        }
         const toRemove: Set<string> = new Set();
         const byIndex = this.citationByIndex
             .map(i => ({
@@ -177,11 +133,18 @@ class CitationStore {
         return toJS(this.byIndex);
     }
 
-    private cleanCSL(CSL: { [id: string]: CSL.Data }): ObservableMap<CSL.Data> {
-        for (const key of Object.keys(CSL)) {
-            CSL[key].language = locales[CSL[key].language!] || 'en-US';
-        }
-        return observable.map(CSL);
+    private cleanCSL(csl: { [id: string]: CSL.Data }): ObservableMap<CSL.Data> {
+        const cleaned: Array<[string, CSL.Data]> = Object.entries(
+            csl,
+        ).reduce((arr, [key, value]) => {
+            const item = {
+                ...value,
+                language:
+                    value.language && locales[value.language] ? locales[value.language] : 'en-US',
+            };
+            return <Array<[string, CSL.Data]>>[...arr, [key, item]];
+        }, []);
+        return observable.map(new Map(cleaned));
     }
 }
 
@@ -202,7 +165,7 @@ export default class Store {
     /**
      * The user's selected link format.
      */
-    links: 'always' | 'urls' | 'never' | 'always-full-surround';
+    links: ABT.LinkStyle;
 
     /**
      * The user's locale provided by WordPress.
@@ -228,20 +191,20 @@ export default class Store {
     }
 
     @action
-    reset() {
+    reset(): void {
         this.citations = new CitationStore([], {});
     }
 
     @action
-    setStyle(style: string) {
+    setStyle(style: string): void {
         this.citationStyle.set(style);
     }
 
-    get cache() {
+    private get cache(): ABT.EditorState['cache'] {
         return {
             links: this.links,
             locale: this.locale,
-            style: this.citationStyle,
+            style: this.citationStyle.get(),
         };
     }
 }
diff --git a/src/js/utils/devtools.ts b/src/js/utils/devtools.ts
index 99be3d31..8ee0f93c 100644
--- a/src/js/utils/devtools.ts
+++ b/src/js/utils/devtools.ts
@@ -1,9 +1,9 @@
 // tslint:disable: no-typeof-undefined
-export default function devtool() {
+export default function devtool(): any {
     if (process.env.NODE_ENV === 'development') {
         return require('mobx-react-devtools').default;
     }
-    return () => null;
+    return (): null => null;
 }
 
 export function configureDevtool(options: {
diff --git a/src/js/utils/logger.ts b/src/js/utils/logger.ts
index c68af997..bc6909de 100644
--- a/src/js/utils/logger.ts
+++ b/src/js/utils/logger.ts
@@ -13,7 +13,7 @@ const config = {
         },
         ...top.ABT.wp.info,
     },
-    transform: (payload: any) => {
+    transform: (payload: any): void => {
         const trace = payload.body.trace;
         if (trace && trace.frames) {
             for (const [i, frame] of trace.frames.entries()) {
diff --git a/src/js/utils/polyfill.ts b/src/js/utils/polyfill.ts
index 8a9875dd..e30bf221 100644
--- a/src/js/utils/polyfill.ts
+++ b/src/js/utils/polyfill.ts
@@ -2,10 +2,10 @@ if (!top._babelPolyfill) {
     require('babel-polyfill');
 }
 
-((global: any) => {
+((global: any): void => {
     if (typeof global.CustomEvent === 'function') return;
 
-    function CustomEvent(event: any, params: any) {
+    function CustomEvent(event: any, params: any): CustomEvent {
         params = params || { bubbles: false, cancelable: false, detail: undefined };
         const evt = document.createEvent('CustomEvent');
         evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);
diff --git a/src/js/utils/render.tsx b/src/js/utils/render.tsx
index c217e818..aa11971a 100644
--- a/src/js/utils/render.tsx
+++ b/src/js/utils/render.tsx
@@ -1,6 +1,6 @@
 import { render as Render } from 'react-dom';
 
-export default function render(component: any, selector: string) {
+export default function render(component: any, selector: string): void {
     const interval = setInterval(() => {
         const element = document.querySelector(selector);
         if (element) {
diff --git a/src/js/utils/styles.ts b/src/js/utils/styles.ts
index 83ecb7f5..4d5d7136 100644
--- a/src/js/utils/styles.ts
+++ b/src/js/utils/styles.ts
@@ -1,25 +1,25 @@
 import * as tinycolor from 'tinycolor2';
 
 export const colors = {
-    get blue() {
+    get blue(): tinycolorInstance {
         return tinycolor('#0085ba');
     },
-    get border() {
+    get border(): tinycolorInstance {
         return tinycolor('rgba(0, 0, 0, .12)');
     },
-    get dark_gray() {
+    get dark_gray(): tinycolorInstance {
         return tinycolor('#555');
     },
-    get disabled() {
+    get disabled(): tinycolorInstance {
         return tinycolor('#a0a5aa');
     },
-    get font_light() {
+    get font_light(): tinycolorInstance {
         return tinycolor('rgba(0, 0, 0, .54)');
     },
-    get light_gray() {
+    get light_gray(): tinycolorInstance {
         return tinycolor('#f5f5f5');
     },
-    get tooltip_gray() {
+    get tooltip_gray(): tinycolorInstance {
         return tinycolor('rgba(66, 66, 66, .9)');
     },
 };
diff --git a/src/js/worker/worker.ts b/src/js/worker/worker.ts
index 74999f9f..c1955bf8 100644
--- a/src/js/worker/worker.ts
+++ b/src/js/worker/worker.ts
@@ -9,11 +9,11 @@ interface GithubContentsResponse {
     items: GithubItemDescriptor[];
 }
 
-((self: DedicatedWorkerGlobalScope) => {
+((self: DedicatedWorkerGlobalScope): void => {
     async function fetchSingleLocale(file: string): Promise<{}> {
-        return new Promise<{}>((resolve, reject) => {
+        return new Promise<{}>((resolve, reject): void => {
             const req = new XMLHttpRequest();
-            req.onreadystatechange = () => {
+            req.onreadystatechange = (): void => {
                 if (req.readyState === 4) {
                     if (req.status !== 200) reject(new Error(req.responseText));
                     const match = file.match(/locales-(.+).xml/);
@@ -33,10 +33,10 @@ interface GithubContentsResponse {
         });
     }
 
-    (async () => {
-        return new Promise<GithubContentsResponse>((resolve, reject) => {
+    (async (): Promise<void> => {
+        return new Promise<GithubContentsResponse>((resolve, reject): void => {
             const req = new XMLHttpRequest();
-            req.onreadystatechange = () => {
+            req.onreadystatechange = (): void => {
                 if (req.readyState === 4) {
                     if (req.status !== 200) reject(new Error(req.responseText));
                     resolve(JSON.parse(req.responseText));
diff --git a/src/php/backend.php b/src/php/backend.php
index e5d1ec15..7c4fd36b 100644
--- a/src/php/backend.php
+++ b/src/php/backend.php
@@ -103,18 +103,6 @@ public function load_tinymce_css($mce_css) {
      */
     public function add_metaboxes($post_type) {
         $disabled_post_types = apply_filters('abt_disabled_post_types', ['acf', 'um_form']);
-        $is_invalid_post_type = in_array(
-            $post_type,
-            array_merge(
-                ['attachment'],
-                is_array($disabled_post_types) ? $disabled_post_types : []
-            )
-        );
-
-        if ($is_invalid_post_type) {
-            return;
-        }
-
         $all_types = get_post_types();
         add_meta_box(
             'abt-reflist',
@@ -158,13 +146,7 @@ public function save_meta($post_id) {
      * Registers and enqueues all required scripts.
      */
     public function enqueue_admin_scripts() {
-        global $post_type;
-
-        $invalid_post_type = in_array($post_type, ['attachment', 'acf', 'um_form']);
-
-        if ($invalid_post_type) {
-            return;
-        }
+        global $post;
 
         $ABT_i18n = i18n\generate_translations();
         $state = json_decode(get_post_meta($post->ID, '_abt-reflist-state', true), true);
diff --git a/src/vendor/worker.js b/src/vendor/worker.js
deleted file mode 100644
index 319c8325..00000000
--- a/src/vendor/worker.js
+++ /dev/null
@@ -1,43 +0,0 @@
-
-function fetchLocales() {
-    return new Promise(function(resolve, reject) {
-        var req = new XMLHttpRequest();
-        req.onreadystatechange = function() {
-            if (req.readyState === 4) {
-                if (req.status !== 200) reject(new Error(req.responseText));
-                resolve(JSON.parse(req.responseText));
-            }
-        };
-        req.open("GET", "https://api.github.com/search/code?q=repo%3Acitation-style-language%2Flocales%20extension%3Axml&per_page=100");
-        req.send(null);
-    })
-    .then(function(data) {
-        var promises = [];
-        data.items.forEach(function(item) {
-            promises.push(this.fetchSingleLocale(item.name));
-        });
-        Promise.all(promises).then(function() {
-            self.postMessage(['done']);
-            self.close();
-        });
-    })
-    .catch(function(e) { return e; });
-}
-
-function fetchSingleLocale(file) {
-    return new Promise(function(resolve, reject) {
-        var req = new XMLHttpRequest();
-        req.onreadystatechange = function() {
-            if (req.readyState === 4) {
-                if (req.status !== 200) reject(new Error(req.responseText));
-                var key = file.match(/locales-(.+).xml/)[1];
-                self.postMessage([key, req.responseText]);
-                resolve(true);
-            }
-        };
-        req.open("GET", 'https://raw.githubusercontent.com/citation-style-language/locales/master/' + file);
-        req.send(null);
-    });
-}
-
-fetchLocales();
diff --git a/tslint.json b/tslint.json
index 83231967..f32ecacb 100644
--- a/tslint.json
+++ b/tslint.json
@@ -33,6 +33,9 @@
     "quotemark": false,
     "semicolon": false,
     "trailing-comma": false,
+    "typedef": {
+      "options": ["call-signature", "arrow-call-signature"]
+    },
     "variable-name": false,
     "whitespace": false,
 
@@ -88,5 +91,8 @@
     "jsx-no-lambda": true,
     "jsx-no-string-ref": true,
     "jsx-self-close": true
+  },
+  "linterOptions": {
+    "exclude": ["src/**/__tests__/*", "src/**/__mocks__/*"]
   }
 }