From 1d1e8b168c119f138d434e578df44f50c148acad Mon Sep 17 00:00:00 2001
From: David Shanske <david@shanske.com>
Date: Sun, 5 Mar 2017 00:29:17 -0500
Subject: [PATCH] Link Preview Branch Merge (#75)

* Introduce New Parse This Class as Part of Link Preview Refactor

* Refactoring into New Configuration

* Switch from admin-ajax to REST API ajax

* Add nonce and pass rest URL

* Improve the Interface

* Final Mockup of Post Properties UI Changes - Need to Refactor save and retrieve next

* Switch to function to generate all fields

* Fix Saving of Settings including new ones

* Store URL as array to match Micropub but only store single value regardless

* Fix Duration Calculation

* Document work so far in README

* Begin Switching to More Conventional Templating using Output Buffering

* If summary equals name unset name

* Remove Facebook Manual Embed as WordPress now supports it as of 4.7

* Rich Embed Feature will only embed whitelisted sites by default if enabled

* Set Post Format based on Post Kind

* Final Cleanup Before Pause for Testing

* Fix tags and use semicolon separated over line separated

* Adjust appearance of form boxes

* Settings redo

* Update help section

* Update Mood SVG and accessibility test

* Fix Issues with Mood SVG that Blanked All Icons in Sprite

* Cleanup before merge
---
 includes/class-kind-config.php                | 201 +++--
 includes/class-kind-meta.php                  |  97 +--
 includes/class-kind-tabmeta.php               | 185 +++--
 includes/class-kind-taxonomy.php              |  55 +-
 includes/class-kind-view.php                  | 219 +++---
 includes/class-link-preview.php               | 306 ++------
 ...ss-mf2-cleaner.php => class-parse-mf2.php} | 171 ++++-
 includes/class-parse-this.php                 | 726 ++++++++++++++++++
 includes/kind-functions.php                   |  16 +
 includes/kind-sprite.svg                      |   4 +-
 includes/tabs/retrieve.js                     | 108 +--
 includes/tabs/tab-author.php                  |  22 +
 includes/tabs/tab-citation.php                |  42 -
 includes/tabs/tab-details.php                 |  25 +
 includes/tabs/tab-location.php                |  23 -
 includes/tabs/tab-main.php                    |  41 +
 includes/tabs/tab-navigation.php              |  25 +-
 includes/tabs/tab-other.php                   |  23 +
 includes/tabs/tab-response.php                |  29 -
 includes/tabs/tab-time.php                    |  52 --
 includes/tabs/time.js                         |  23 +-
 includes/views/kind.php                       |  93 ++-
 indieweb-post-kinds.php                       |  14 +-
 languages/post_kinds.pot                      | 411 +++++-----
 package.json                                  |   5 +-
 readme.md                                     |  36 +-
 readme.txt                                    |  36 +-
 svgs/bookmark.svg                             |   3 +-
 svgs/mood.svg                                 | 564 +-------------
 29 files changed, 1941 insertions(+), 1614 deletions(-)
 rename includes/{class-mf2-cleaner.php => class-parse-mf2.php} (78%)
 create mode 100644 includes/class-parse-this.php
 create mode 100644 includes/tabs/tab-author.php
 delete mode 100644 includes/tabs/tab-citation.php
 create mode 100644 includes/tabs/tab-details.php
 delete mode 100644 includes/tabs/tab-location.php
 create mode 100644 includes/tabs/tab-main.php
 create mode 100644 includes/tabs/tab-other.php
 delete mode 100644 includes/tabs/tab-response.php
 delete mode 100644 includes/tabs/tab-time.php

diff --git a/includes/class-kind-config.php b/includes/class-kind-config.php
index 0a6af65..62a341a 100644
--- a/includes/class-kind-config.php
+++ b/includes/class-kind-config.php
@@ -12,18 +12,6 @@
  * @package Post Kinds
  */
 class Kind_Config {
-	public static function Defaults() {
-		return array(
-			'embeds' => '0',
-			'disableformats' => '0',
-			'protection' => '0',
-			'contentelements' => '',
-			'defaultkind' => 'article',
-			'termslist' => array( 'article', 'reply', 'bookmark' ),
-			'themecompat' => '0',
-		);
-
-	}
 
 	/**
 	 * Function to Initialize the Configuration.
@@ -46,12 +34,39 @@ public static function init() {
 	public static function admin_init() {
 		$args = array(
 			'type' => 'array',
-			'description' => 'Post Kind Options',
+			'description' => 'Kinds Enabled on This Site',
+			'show_in_rest' => true,
+			'default' => array( 'article', 'reply', 'bookmark' )
+		);
+		register_setting( 'iwt_options', 'kind_termslist', $args );
+		$args = array(
+			'type' => 'string',
+			'description' => 'Default Kind',
+			'show_in_rest' => true,
+			'default' => 'note'
+		);
+		register_setting( 'iwt_options', 'kind_default', $args );
+		$args = array(
+			'type' => 'boolean',
+			'description' => 'Rich Embed Support for Whitelisted Sites',
+			'show_in_rest' => true,
+			'default' => 1
+		);
+		register_setting( 'iwt_options', 'kind_embeds', $args );
+		$args = array(
+			'type' => 'boolean',
+			'description' => 'Disable Content Protection on Responses',
+			'show_in_rest' => true,
+			'default' => 0
+		);
+		register_setting( 'iwt_options', 'kind_protection', $args );
+		$args = array(
+			'type' => 'string',
+			'description' => 'KSES Content Protection on Responses',
 			'show_in_rest' => true,
-			'default' => self::Defaults(),
+			'default' => str_replace( '},"',"},\r\n\"", wp_json_encode( wp_kses_allowed_html( 'post' ), JSON_PRETTY_PRINT ) )
 		);
-		register_setting( 'iwt_options', 'iwt_options', $args );
-		$options = get_option( 'iwt_options' );
+		register_setting( 'iwt_options', 'kind_kses', $args );
 		add_settings_section( 
 			'iwt-content', 
 			__( 'Content Options', 
@@ -60,59 +75,45 @@ public static function admin_init() {
 			'iwt_options' 
 		);
 		add_settings_field( 
-			'embeds', 
-			__( 'Add Rich Embed Support for Facebook, Google Plus, Instagram, etc', 'indieweb-post-kinds' ), 
-			array( 'Kind_Config', 'checkbox_callback' ), 
-			'iwt_options', 'iwt-content' ,  array( 'name' => 'embeds' ) 
+			'termslist', 
+			__( 'Select All Kinds You Wish to Use', 'indieweb-post-kinds' ),
+			array( 'Kind_Config', 'termcheck_callback' ),
+			'iwt_options',
+			'iwt-content' 
 		);
-		add_settings_field( 'themecompat', 
-			__( 'Extra Styling for Themes That May Not Support Post Kinds. Includes hiding of titles on kinds that do not usually have an explicit title.', 'indieweb-post-kinds' ), 
-			array( 'Kind_Config', 'checkbox_callback' ), 
-			'iwt_options', 
-			'iwt-content' ,  
-			array( 'name' => 'themecompat' ) 
+		add_settings_field( 
+			'defaultkind', 
+			__( 'Default Kind', 'indieweb-post-kinds' ),
+			array( 'Kind_Config', 'defaultkind_callback' ),
+			'iwt_options',
+			'iwt-content'
 		);
+
 		add_settings_field( 
-			'disableformats', 
-			__( 'Disable Post Formats', 
-			'indieweb-post-kinds' ), 
+			'embeds', 
+			__( 'Add Rich Embed Support for Whitelisted Sites', 'indieweb-post-kinds' ), 
 			array( 'Kind_Config', 'checkbox_callback' ), 
-			'iwt_options', 
-			'iwt-content' ,  
-			array( 'name' => 'disableformats' ) 
+			'iwt_options', 'iwt-content' ,  array( 'name' => 'kind_embeds' ) 
 		);
+
 		add_settings_field( 
 			'protection', 
 			__( 'Disable Content Protection on Responses', 'indieweb-post-kinds' ), 
 			array( 'Kind_Config', 'checkbox_callback' ),
 			'iwt_options',
 			'iwt-content',
-			array( 'name' => 'protection' )
+			array( 'name' => 'kind_protection' )
 		);
-		if ( array_key_exists( 'protection', $options ) && 1 === $options['protection'] ) {
+		if ( 1 == get_option( 'kind_protection' ) ) {
 			add_settings_field( 
 				'contentelements', 
 				__( 'Response Content Allowed Html Elements', 'indieweb-post-kinds' ) . ' <a href="http://codex.wordpress.org/Function_Reference/wp_kses">*</a>', 
 				array( 'Kind_Config', 'textbox_callback' ),
 				'iwt_options', 
 				'iwt-content',
-				array( 'name' => 'contentelements' )
+				array( 'name' => 'kind_kses' )
 			);
 		}
-		add_settings_field( 
-			'termslist', 
-			__( 'Select All Kinds You Wish to Use', 'indieweb-post-kinds' ),
-			array( 'Kind_Config', 'termlist_callback' ),
-			'iwt_options',
-			'iwt-content' 
-		);
-		add_settings_field( 
-			'defaultkind', 
-			__( 'Default Kind', 'indieweb-post-kinds' ),
-			array( 'Kind_Config', 'defaultkind_callback' ),
-			'iwt_options',
-			'iwt-content'
-		);
 		// Add Query Var to Admin
 		add_filter( 'query_vars', array( 'Kind_Config', 'query_var' ) );
 
@@ -164,11 +165,10 @@ public static function options_callback() {
 	 *		@type string $name Checkbox Name.
 	 */
 	public static function checkbox_callback( array $args ) {
-		$options = get_option( 'iwt_options', self::Defaults() );
-		$name = $args['name'];
-		$checked = ifset( $options[ $name ] );
-		echo "<input name='iwt_options[" . esc_html( $name ) . "]' type='hidden' value='0' />";
-		echo "<input name='iwt_options[" . esc_html( $name ) . "]' type='checkbox' value='1' " . checked( 1, $checked, false ) . ' /> ';
+		$option = get_option( $args['name'] );
+		$checked = ifset( $option );
+		echo "<input name='" . $args['name'] . "' type='hidden' value='0' />";
+		echo "<input name='" . $args['name'] . "' type='checkbox' value='1' " . checked( 1, $checked, false ) . ' /> ';
 	}
 
 	/**
@@ -181,15 +181,11 @@ public static function checkbox_callback( array $args ) {
 	 *    @type string $name Textbox Name.
 	 */
 	public static function textbox_callback( array $args ) {
-		$options = get_option( 'iwt_options', self::Defaults() );
-		$name = $args['name'];
-		$val = '';
-		if ( 'contentelements' === $name && ! array_key_exists( 'contentelements', $options ) ) {
-			$val = str_replace( '},"',"},\r\n\"", wp_json_encode( wp_kses_allowed_html( 'post' ), JSON_PRETTY_PRINT ) );
-		} else {
-			$val = $options[ $name ];
+		$option = get_option( $args['name'] );
+		if ( is_array( $option ) ) {
+			$option = print_r( $option, true );
 		}
-		echo "<textarea rows='10' cols='50' class='large-text code' name='iwt_options[" . esc_html( $name ) . "]'>". esc_textarea( print_r( $val,true ) ) . '</textarea> ';
+		echo "<textarea rows='10' cols='50' class='large-text code' name='" . $args['name'] . "'>". $option . '</textarea> ';
 	}
 
 	/**
@@ -197,44 +193,35 @@ public static function textbox_callback( array $args ) {
 	 *
 	 * @access public
 	 */
-	public static function termlist_callback() {
-		$options = get_option( 'iwt_options', self::Defaults() );
+	public static function termcheck_callback() {
 		$terms = Kind_Taxonomy::get_strings();
 		// Hide these terms until ready for use for now.
-		$hide = array( 'note', 'weather', 'exercise', 'travel', 'rsvp', 'tag', 'follow', 'drink', 'eat' );
-		// Hide checkin option unless Simple Location is active.
-		if ( ! class_exists( 'loc_config' ) ) {
-			$hide[] = 'checkin';
-		}
+		$hide = array( 'note', 'weather', 'exercise', 'travel', 'itinerary', 'tag', 'follow', 'drink', 'eat', 'trip', 'checkin', 'recipe', 'mood' );
 		foreach ( $hide as $hid ) {
 			unset( $terms[ $hid ] );
 		}
-		$termslist = $options['termslist'];
-		echo '<select id="termslist" name="iwt_options[termslist][]" multiple>';
+		$termslist = get_option('kind_termslist');
 		foreach ( $terms as $key => $value ) {
-			echo '<option value="' . $key . '" '. selected( in_array( $key, $termslist ) ) . '>' . $value . '</option>';
+			echo "<input name='kind_termslist[]' type='checkbox' value='" . $key . "' " . checked( in_array( $key, $termslist ), true, false ) . ' />' . $value . '<br />';
 		}
-		echo '</select>';
 	}
 
+
 	/**
 	 * Generate a Term List.
 	 *
 	 * @access public
 	 */
 	public static function defaultkind_callback() {
-		$options = get_option( 'iwt_options', self::Defaults() );
-		$terms = $options['termslist'];
+		$terms = get_option('kind_termslist');
 		$terms[] = 'note';
 		$strings = Kind_Taxonomy::get_strings();
 
-		$defaultkind = $options['defaultkind'];
+		$defaultkind = get_option('kind_default');
 
-		echo '<select id="defaultkind" name="iwt_options[defaultkind]">';
 		foreach ( $terms as $term ) {
-			echo '<option value="' . $term . '" '. selected( $term, $defaultkind ) . '>' . $strings[$term] . '</option>';
+			echo '<input id="kind_default" name="kind_default" type="radio" value="' . $term . '" '. checked( $term, $defaultkind, false ) . ' />' . $strings[$term] . '<br />';
 		}
-		echo '</select>';
 	}
 
 
@@ -258,41 +245,37 @@ public static function options_form() {
 		echo '</form></div>';
 	}
 
-	/**
-	 * Disable Post Formats.
-	 *
-	 * @access public
-	 */
-	public static function remove_post_formats() {
-		$options = get_option( 'iwt_option', self::Defaults() );
-		if ( 1 === ifset( $options['disableformats'] ) ) { remove_theme_support( 'post-formats' ); }
-	}
-
 	public static function add_post_help_tab() {
 		get_current_screen()->add_help_tab( array(
 			'id'       => 'post_kind_help',
 			'title'    => __( 'Post Properties', 'indieweb-post-kinds' ),
 			'content'  => __('
-						<p> The Post Properties tab represents the Microformats properties of a Post. For different kinds of posts, the different
-						fields mean something different. Example: Artist Name vs Author Name</p>
-						<ul><strong>Response</strong>
-							<li><strong>URL</strong> - The URL the post is responding to</li>
-							<li><strong>Name/Title</strong> - The name of what is being responded to</li>
-						</ul>
-						<ul><strong>Citation</strong>
-							<li><strong>Summary</strong> - Summary of what the post is responding to</li>
-							<li><strong>Site Name/Publication/Album</strong></li>
-							<li><strong>Featured Image</strong> - The URL of a featured image of what is being responded to </li>
-							<li><strong>Author/Artist Name</strong> </li>
-							<li><strong>Author/Artist URL</strong></li>
-							<li><strong>Author Photo URL</strong></li>
-						</ul>
-            <ul><strong>Time</strong>
-              <li><strong>Start/Published Time</strong></li>
-              <li><strong>End/Updated Time</strong></li>
-            </ul>
-
-
+				<p> The Post Properties tab represents the Microformats properties of a Post. For different kinds of posts, the different
+				fields mean something different. Example: Artist Name vs Author Name</p>
+				<ul><strong>Main</strong>
+					<li><strong>URL</strong> - The URL the post is responding to</li>
+					<li><strong>Name/Title</strong> - The name of what is being responded to</li>
+					<li><strong>Summary/Quote</strong> - Summary of what the post is responding to or quote</li>
+					<li><strong>Tags</strong> - Tags or categories for the piece to be displayed as hashtags</li>
+				</ul>
+				<ul><strong>Details</strong>
+					<li><strong>Site Name/Publication/Album</strong></li>
+					<li><strong>Featured Image/Site Icon</strong> - The URL of a featured image of what is being responded to or a site icon</li>
+              				<li><strong>Published Time</strong></li>
+              				<li><strong>Updated Time</strong></li>
+				</ul>
+				<ul><strong>Author</strong>
+					<li><strong>Author/Artist Name</strong> </li>
+					<li><strong>Author/Artist URL</strong></li>
+					<li><strong>Author/Artist Photo URL</strong></li>
+				</ul>
+				<ul><strong>Other</strong>
+              				<li><strong>Start Time</strong></li>
+              				<li><strong>End Time</strong></li>
+					<li><strong>Duration</strong> - Duration is calculated based on the difference between start and end time. You may just use the time field, 
+					omitting date and timezone and setting start time to 0:00:00 to set a simple duration.</li> 
+					<li><strong>RSVP</strong> - For RSVP posts, you can specify whether you are attending, not attending, unsure, or simply interested.</li>
+            			</ul>
 			', 'indieweb-post-kinds'),
 		) );
 	}
diff --git a/includes/class-kind-meta.php b/includes/class-kind-meta.php
index bed10f8..fee8476 100644
--- a/includes/class-kind-meta.php
+++ b/includes/class-kind-meta.php
@@ -137,26 +137,19 @@ private function get_mf2meta( $post ) {
 	}
 
 	public static function sanitize_content( $value ) {
-		global $wpdb;
-		$options = get_option( 'iwt_options', Kind_Config::Defaults() );
-		$allowed = wp_kses_allowed_html( 'post' );
-		if ( array_key_exists( 'contentelements', $options ) && json_decode( $options['contentelements'] ) != null ) {
-			$allowed = json_decode( $options['contentelements'], true );
-		}
-		$charset = $wpdb->get_col_charset( $wpdb->posts, $value );
-		if ( 'utf8' === $charset ) {
-			$value = wp_encode_emoji( $value );
-		}
-
-		if ( ifset( $options[ 'protection' ] ) ) {
+		if ( ! is_string( $value ) ) {
 			return $value;
 		}
+		$allowed = wp_kses_allowed_html( 'post' );
+		if ( 1 == get_option( 'kind_protection' ) ) {
+			$allowed = json_decode( get_option( 'kind_kses' ), true );
+		}
 		return wp_kses( ( string ) $value , $allowed );
 	}
 
 	public static function sanitize_text( $value ) {
 		if ( is_array( $value ) ) {
-			return array_map( $value, array( 'Kind_Meta', 'sanitize_text' ) );
+			return array_map( array( 'Kind_Meta', 'sanitize_text' ), $value );
 		}
 		if ( self::is_url( $value ) ) {
 			$value = esc_url_raw( $value );
@@ -213,7 +206,12 @@ public function get_url( ) {
 		}
 		if ( array_key_exists( $kind, $map ) ) {
 			if ( array_key_exists( $map[ $kind ], $this->meta ) ) {
-				return $this->meta[ $map[ $kind ] ];
+				if ( is_string( $this->meta[ $map[ $kind ] ] ) ) {
+					return $this->meta[ $map[ $kind ] ];
+				}
+				if ( is_array( $this->meta[ $map[ $kind ] ] ) ) {
+					return $this->meta[ $map [ $kind ] ][0];
+				}	
 			}
 		}
 		return false;
@@ -233,7 +231,7 @@ public function set_url( $url ) {
 		$map = array_diff( Kind_Taxonomy::get_kind_properties(), array( '' ) );
 		if ( $kind ) {
 			if ( array_key_exists( $kind, $map ) ) {
-				$this->meta[ $map[ $kind ] ] = $url;
+				$this->meta[ $map[ $kind ] ] = array( $url );
 			}
 		}
 		if ( ! array_key_exists( 'cite', $this->meta ) ) {
@@ -332,23 +330,21 @@ public function set_cite($cite) {
 		if ( ! $cite ) {
 			return false;
 		}
-		$summary = ifset( $cite['summary'] );
-		$content = ifset( $cite['content'] );
 		$cite = array_map( array( 'Kind_Meta', 'sanitize_text' ), $cite );
 
 		if ( isset( $cite['summary'] ) ) {
-				$cite['summary'] = self::sanitize_content( $summary );
+				$cite['summary'] = self::sanitize_content( $cite['summary'] );
 		}
 		if ( isset( $cite['content'] ) ) {
-				$cite['content'] = self::sanitize_content( $content );
+				$cite['content'] = self::sanitize_content( $cite['content'] );
 		}
-		$cite = array_filter( array_diff( $cite, array( '' ) ) );
+		$cite = array_filter( $cite );
 		$this->meta['cite'] = $cite;
 	}
 
 	public function build_time($date, $time, $offset) {
 		if ( empty( $date ) ) {
-			return false;
+			$date = '0000-01-01';
 		}
 		if ( empty( $time ) ) {
 			$time = '00:00:00';
@@ -390,18 +386,23 @@ public function get_duration() {
 		if ( array_key_exists( 'duration', $this->meta ) ) {
 			return $this->meta['duration'];
 		}
+		if ( array_key_exists( 'dt-start', $this->meta ) && array_key_exists( 'dt-end', $this->meta ) ) {
+			return $this->calculate_duration( $this->meta['dt-start'], $this->meta['dt-end'] );
+		}
+		return false;
+	}
+
+	public function calculate_duration( $start_string, $end_string ) {
 		$start = array();
 		$end = array();
-		if ( array_key_exists( 'dt-start', $this->meta ) ) {
-			$start = date_create_from_format( 'Y-m-d\TH:i:sP', $this->meta['dt-start'] );
-		} else if ( ! empty( $this->meta['cite']['published'] ) ) {
-			$start = date_create_from_format( 'Y-m-d\TH:i:sP',$this->meta['cite']['published'] );
+		if ( ! is_string( $start_string ) || ! is_string( $end_string ) ) {
+			return false;
 		}
-		if ( ! empty( $this->meta['dt-end'] ) ) {
-			$end = date_create_from_format( 'Y-m-d\TH:i:sP', $this->meta['dt-end'] );
-		} else if ( ! empty( $this->meta['cite']['updated'] ) ) {
-			$end = date_create_from_format( 'Y-m-d\TH:i:sP',$this->meta['cite']['updated'] );
+		if ( $start_string == $end_string ) {
+			return false;
 		}
+		$start = date_create_from_format( 'Y-m-d\TH:i:sP', $start_string );
+		$end = date_create_from_format( 'Y-m-d\TH:i:sP', $end_string );
 		if ( ($start instanceof DateTime) && ($end instanceof DateTime)  ) {
 			$duration = $start->diff( $end );
 			return self::dateIntervalToString( $duration );
@@ -409,38 +410,18 @@ public function get_duration() {
 		return false;
 	}
 
-	public function set_time($dt_start, $dt_end) {
-		if ( ! empty( $dt_start ) || $dt_start ) {
-			$this->meta['dt-start'] = $dt_start;
-		}
-		if ( ! empty( $dt_end ) || $dt_end ) {
-			$this->meta['dt-end'] = $dt_end;
-		}
-	}
-
-	public function get_time() {
+	public function divide_time( $time_string ) {
 		$time = array();
-		if ( ! empty( $this->meta['dt-start'] ) ) {
-				$start = date_create_from_format( 'Y-m-d\TH:i:sP', $this->meta['dt-start'] );
-		} else if ( ! empty( $this->meta['cite']['published'] ) ) {
-				$start = date_create_from_format( 'Y-m-d\TH:i:sP',$this->meta['cite']['published'] );
-		}
-		if ( isset( $start ) && $start ) {
-			$time['start_date'] = $start->format( 'Y-m-d' );
-			$time['start_time'] = $start->format( 'H:i:s' );
-			$time['start_offset'] = $start->format( 'P' );
-		}
-
-		if ( ! empty( $this->meta['dt-end'] ) ) {
-			$end = date_create_from_format( 'Y-m-d\TH:i:sP', $this->meta['dt-end'] );
-		} else if ( ! empty( $this->meta['cite']['updated'] ) ) {
-			$end = date_create_from_format( 'Y-m-d\TH:i:sP',$this->meta['cite']['updated'] );
+		$datetime = date_create_from_format( 'Y-m-d\TH:i:sP', $time_string );
+		if ( ! $datetime ) {
+			return;
 		}
-		if ( isset( $end ) && $end ) {
-			$time['end_date'] = $end->format( 'Y-m-d' );
-			$time['end_time'] = $end->format( 'H:i:s' );
-			$time['end_offset'] = $end->format( 'P' );
+		$time['date'] = $datetime->format( 'Y-m-d' );
+		if ( '0000-01-01' == $time['date'] ) {
+			$time['date'] = '';
 		}
+		$time['time'] = $datetime->format( 'H:i:s' );
+		$time['offset'] = $datetime->format( 'P' );
 		return $time;
 	}
 
diff --git a/includes/class-kind-tabmeta.php b/includes/class-kind-tabmeta.php
index ea1f1ec..25ac400 100755
--- a/includes/class-kind-tabmeta.php
+++ b/includes/class-kind-tabmeta.php
@@ -56,6 +56,16 @@ public static function enqueue_admin_scripts() {
 				self::$version
 			);
 
+			// Provide a global object to our JS file containing our REST API endpoint, and API nonce
+			// Nonce must be 'wp_rest'
+			wp_localize_script( 'kindmeta-response', 'rest_object',
+				array(
+					'api_nonce' => wp_create_nonce( 'wp_rest' ),
+					'api_url'   => site_url('/wp-json/link-preview/1.0/'),
+					'link_preview_success_message' => __( 'Your URL has been successfully retrieved and parsed', 'indieweb-post-kinds' )
+				)
+			);
+
 			wp_enqueue_script(
 				'moment',
 				'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js',
@@ -72,34 +82,94 @@ public static function kind_get_timezones() {
 		foreach ( $t_zones as $a ) {
 			$t = '';
 			try {
-      	// this throws exception for 'US/Pacific-New'
-        $zone = new DateTimeZone( $a );
-
-        $seconds = $zone->getOffset( new DateTime( 'now' , $zone ) );
-        $o[] = self::tz_seconds_to_offset( $seconds );
-      } // exceptions must be catched, else a blank page
-      catch (Exception $e) {
-      	// die("Exception : " . $e->getMessage() . '<br />');
-        // what to do in catch ? , nothing just relax
-    	}
-    }
-    $o = array_unique( $o );
-    asort( $o );
-
-    return $o;
+      				// this throws exception for 'US/Pacific-New'
+        			$zone = new DateTimeZone( $a );
+				$seconds = $zone->getOffset( new DateTime( 'now' , $zone ) );
+        			$o[] = self::tz_seconds_to_offset( $seconds );
+      			} // exceptions must be catched, else a blank page
+      			catch (Exception $e) {
+      			// die("Exception : " . $e->getMessage() . '<br />');
+        		// what to do in catch ? , nothing just relax
+    			}
+    		}
+    		$o = array_unique( $o );
+    		asort( $o );
+		return $o;
+	}
+
+	public static function kind_the_time( $prefix, $label, $time ) {
+		$tz_seconds = get_option( 'gmt_offset' ) * 3600;
+		$offset = self::tz_seconds_to_offset( $tz_seconds );
+		if ( isset( $time['offset'] ) ) {
+			$offset = $time['offset'];
+		}
+		$string = '<label for="' . $prefix .  '">' . $label . '</label><br/>';
+		$string .= '<input type="date" name="' . $prefix . '_date" id="' . $prefix . '_date" value="' . ifset( $time['date'] ) . '"/>';
+		$string .= '<input type="time" name="' . $prefix . '_time" id="' . $prefix . '_time" step="1" value="' . ifset( $time['time'] ) . '"/>';
+		$string .= self::select_offset( $prefix, $offset );
+		return $string;
+	}
+
+	public static function select_offset( $prefix, $select ) {
+		$tzlist = self::kind_get_timezones();
+		$string = '<select name="'  . $prefix . '_offset" id="' . $prefix . '_offset">';
+		foreach ( $tzlist as $key => $value ) {
+			$string .= '<option value="' . $value . '"';
+			if ( $select == $value ) {
+				$string .= ' selected';
+			}
+			$string .= '>GMT' . $value . '</option>';
+		}
+		$string .= '</select>';
+		return $string;
+	}
+
+	public static function rsvp_select( $selected ) {
+		$rsvps = array(
+			'' => false,
+			'yes' => __( 'Yes', 'indieweb-post-kinds' ),
+			'no' => __( 'No', 'indieweb-post-kinds' ),
+			'maybe' => __( 'Maybe', 'indieweb-post-kinds' ),
+			'interested' => __( 'Interested', 'indieweb-post-kinds' )
+		);
+		$string = '<label for="mf2_rsvp">' . __( 'RSVP', 'indieweb-post-kinds' ) .  '</label><br/>';
+		$string .= '<select name="mf2_rsvp" id="mf2_rsvp">';
+		foreach ( $rsvps as $key => $value ) {
+			$string .= '<option value="' . $key . '"';
+			if ( $selected == $key ) {
+				$string .= ' selected';
+			}
+			$string .= '>' . $value . '</option>';
+		}
+		$string .= '</select>';
+		return $string;
 	}
 
+	// Echos a Standard Formbox Box - Defaulting to Text
+	public static function metabox_text( $property, $label, $default = '', $type = 'text' ) {
+		$string = '<label for="' . $property .  '">' . $label . '</label><br/>';
+		if ( 'textarea' === $type ) {
+			$string .= '<textarea name="' . $property . '" id="' . $property . '" data-role="none" class="widefat">' . $default . '</textarea>';
+			return $string;
+		}
+		$string .= '<input type="' . $type . '" name="' . $property . '" id="' . $property . '" class="widefat" value="' . $default . '" />';
+		return $string;
+
+	}
+
+
+
 	public static function tz_seconds_to_offset($seconds) {
-    return ($seconds < 0 ? '-' : '+') . sprintf( '%02d:%02d', abs( $seconds / 60 / 60 ), abs( $seconds / 60 ) % 60 );
+	    return ($seconds < 0 ? '-' : '+') . sprintf( '%02d:%02d', abs( $seconds / 60 / 60 ), abs( $seconds / 60 ) % 60 );
 	}
 
 	public static function tz_offset_to_seconds($offset) {
-    if ( preg_match( '/([+-])(\d{2}):?(\d{2})/', $offset, $match ) ) {
-      $sign = ($match[1] == '-' ? -1 : 1);
-      return (($match[2] * 60 * 60) + ($match[3] * 60)) * $sign;
-    } else {
-      return 0;
-    }
+	    if ( preg_match( '/([+-])(\d{2}):?(\d{2})/', $offset, $match ) ) {
+	      $sign = ($match[1] == '-' ? -1 : 1);
+	      return (($match[2] * 60 * 60) + ($match[3] * 60)) * $sign;
+	    } else {
+	      return 0;
+	    }
 	}
 
 	/* Create one or more meta boxes to be displayed on the post editor screen. */
@@ -125,7 +195,7 @@ public static function display_metabox( $object, $box ) {
 				$url = $_GET['kindurl'];
 			}
 		}
-		$time = $meta->get_time();
+		$time =  array(); // $meta->get_time();
 		include_once( 'tabs/tab-navigation.php' );
 	}
 
@@ -181,36 +251,53 @@ public static function save_post( $post_id, $post ) {
 		}
 		$kind = get_post_kind_slug( $post );
 		$meta = new Kind_Meta( $post );
-		if ( isset( $_POST['time'] ) ) {
-			if ( isset( $_POST['time']['start_date'] ) || isset( $_POST['time']['start_time'] ) ) {
-				$start = $meta->build_time( $_POST['time']['start_date'], $_POST['time']['start_time'], $_POST['time']['start_offset'] );
-			}
-			if ( isset( $_POST['time']['end_date'] ) || isset( $_POST['time']['end_time'] ) ) {
-				$end = $meta->build_time( $_POST['time']['end_date'], $_POST['time']['end_time'], $_POST['time']['end_offset'] );
-			}
+		$cite = array();
+		$start = '';
+		$end = '';
+
+		if ( isset( $_POST['mf2_start_date'] ) || isset( $_POST['mf2_start_time'] ) ) {
+			$start = $meta->build_time( $_POST['mf2_start_date'], $_POST['mf2_start_time'], $_POST['mf2_start_offset'] );
 		}
-		if ( isset( $_POST['cite'] ) ) {
-			if ( in_array( $kind, array( 'like', 'reply', 'repost', 'favorite', 'bookmark' ) ) ) {
-				if ( ! empty( $start ) ) {
-					$_POST['cite']['published'] = $start;
-				}
-				if ( ! empty( $end )  ) {
-					$_POST['cite']['updated'] = $end;
-				}
-			} else {
-				$meta->set_time( $start, $end );
-			}
-			$meta->set_cite( $_POST['cite'] );
+		if ( isset( $_POST['mf2_end_date'] ) || isset( $_POST['mf2_end_time'] ) ) {
+			$end = $meta->build_time( $_POST['mf2_end_date'], $_POST['mf2_end_time'], $_POST['mf2_end_offset'] );
 		}
-		if ( isset( $_POST['author'] ) ) {
-			$meta->set_author( $_POST['author'] );
+		if ( $start !== $end ) {
+			$meta->set( 'dt-start', $start );
+			$meta->set( 'dt-end', $end );
 		}
-		if ( isset( $_POST['url'] ) ) {
-			$meta->set_url( $_POST['url'] );
+		$duration = $meta->calculate_duration( $start, $end );
+		if ( $duration && ! isset( $_POST['cite_duration'] ) ) {
+			$meta->set( 'duration', $duration );
+		}
+		else { 
+			$meta->del( 'duration' );
+		}
+		$meta->set( 'rsvp' , $_POST['mf2_rsvp' ] );
+
+		if ( isset( $_POST['cite_published_date'] ) || isset( $_POST['published_time'] ) ) {
+			$cite['published'] = $meta->build_time( $_POST['cite_published_date'], $_POST['cite_published_time'], $_POST['cite_published_offset'] );
+		}
+		if ( isset( $_POST['cite_updated_date'] ) || isset( $_POST['cite_updated_time'] ) ) {
+			$cite['updated'] = $meta->build_time( $_POST['cite_updated_date'], $_POST['cite_updated_time'], $_POST['cite_updated_offset'] );
+		}
+		$cite['summary'] = ifset( $_POST['cite_summary'] );
+		$cite['name'] = ifset( $_POST['cite_name'] );
+		if ( isset( $_POST['cite_tags'] ) ) {
+			$cite['category'] = explode( ';', $_POST['cite_tags'] );
+		}
+		$cite['publication'] = ifset ( $_POST['cite_publication'] );
+		$cite['featured'] = ifset( $_POST['cite_featured'] );
+
+		$meta->set_cite( array_filter( $cite ) );
+		$author = array();
+		$author['name'] = ifset( $_POST['cite_author_name'] );
+		$author['url'] = ifset( $_POST['cite_author_url'] );
+		$author['photo'] = ifset( $_POST['cite_author_photo'] );
+		if ( ! empty( $author ) ) {
+			$meta->set_author( $author );
 		}
-		// This is temporary - planning on improving this later
-		if ( isset( $_POST['duration'] ) ) {
-			$meta->set( 'duration', $_POST['duration'] );
+		if ( isset( $_POST['cite_url'] ) ) {
+			$meta->set_url( $_POST['cite_url'] );
 		}
 		$meta->save_meta( $post );
 	}
diff --git a/includes/class-kind-taxonomy.php b/includes/class-kind-taxonomy.php
index 6a1271e..ddb9cde 100755
--- a/includes/class-kind-taxonomy.php
+++ b/includes/class-kind-taxonomy.php
@@ -21,7 +21,7 @@ public static function init() {
 		// Trigger Webmention on Change in Post Status.
 		add_filter( 'transition_post_status', array( 'Kind_Taxonomy', 'transition' ), 10, 3 );
 		// On Post Publish Invalidate any Stored Response.
-		add_action( 'publish_post', array( 'Kind_Taxonomy', 'invalidate_response' ), 10, 2 );
+		add_action( 'save_post', array( 'Kind_Taxonomy', 'post_formats' ), 99, 3 );
 
 		// Add the Correct Archive Title to Kind Archives.
 		add_filter( 'get_the_archive_title', array( 'Kind_Taxonomy', 'kind_archive_title' ) , 10 , 3 );
@@ -41,12 +41,46 @@ public static function init() {
 
 
 	/**
-	 * Deletes cached response.
+	 * Sets Post Format for Post Kind.
 	 *
-	 * @param int $post_id Post to Delete Cache of
+	 * @param int $post_ID Post ID
+	 * @param WP_Post $post Post Object
+	 * @param boolean $update, 
 	 */
-	public static function invalidate_response( $post_id ) {
-		delete_post_meta( $post_id, '_resp_full' );
+	public static function post_formats( $post_ID, $post, $update ) {
+		$kind = get_post_kind_slug( $post_ID );
+		switch ( $kind ) {
+			case 'note':
+				set_post_format( $post_ID, 'aside' );
+				break;
+			case 'article':
+				set_post_format( $post_ID, '' );
+				break;
+			case 'favorite':
+			case 'bookmark':
+			case 'like':
+			case 'reply':
+				set_post_format( $post_ID, 'link' );
+				break;
+			case 'quote':
+				set_post_format( $post_ID, 'quote' );
+				break;
+			case 'listen':
+			case 'jam':
+				set_post_format( $post_ID, 'audio');
+				break;
+			case 'watch':
+				set_post_format( $post_ID, 'video');
+				break;
+			case 'photo':
+				set_post_format( $post_ID, 'image' );
+				break;
+			case 'play':
+			case 'read':
+			case 'rsvp':
+				set_post_format( $post_ID, 'status');
+				break;
+		}
 	}
 
 	/**
@@ -147,11 +181,7 @@ public static function kind_archive_title($title) {
 
 	public static function select_metabox( $post ) {
 		$strings = self::get_strings();
-		$option = get_option( 'iwt_options' );
-		$include = array();
-		if ( array_key_exists( 'termslist', $option ) ) {
-			$include = $option['termslist'];
-		}
+		$include = get_option( 'kind_termslist' );
 		$include = array_merge( $include, array( 'note', 'reply', 'article' ) );
 		// If Simple Location is Enabled, include the check-in type
 		// Filter Kinds
@@ -163,7 +193,7 @@ public static function select_metabox( $post ) {
 		if ( isset( $_GET['kind'] ) ) {
 			$default = get_term_by( 'slug', $_GET['kind'], 'kind' );
 		} else {
-			$default = get_term_by( 'slug', $option['defaultkind'], 'kind' );
+			$default = get_term_by( 'slug', get_option('kind_default'), 'kind' );
 		}
 		$terms = get_terms( 'kind', array( 'hide_empty' => 0 ) );
 		$postterms = get_the_terms( $post->ID, 'kind' );
@@ -405,9 +435,8 @@ public static function publish ( $ID, $post = null ) {
 		if ( 'post' !== get_post_type( $ID ) ) {
 			return;
 		}
-		$option = get_option( 'iwt_options' );
 		if ( count( wp_get_post_terms( $ID,'kind' ) ) <= 0 ) {
-			set_post_kind( $ID, $option['defaultkind'] );
+			set_post_kind( $ID, get_option('kind_default') );
 		}
 	}
 
diff --git a/includes/class-kind-view.php b/includes/class-kind-view.php
index fb290a3..6b95826 100644
--- a/includes/class-kind-view.php
+++ b/includes/class-kind-view.php
@@ -2,7 +2,7 @@
 /**
  * Post Kind View Class
  *
- * Handles the logic of adding the kind displays to the post content.
+ * Includes Helper Functions to Set Up Display Behavior and Allows Calling of View Templates
  */
 
 // The Kind_View class sets up the kind display behavior for kinds
@@ -12,25 +12,70 @@ public static function init() {
 			add_filter( 'the_excerpt', array( 'Kind_View', 'excerpt_response' ), 20 );
 	}
 
-	public static function extract_domain_name( $url ) {
-		$parse = wp_parse_url( $url );
-		return preg_replace( '/^www\./', '', $parse['host'] );
+	// This mirrors get_template_part but for views and locates the correct file and returns the output
+	public static function get_view_part($slug, $name = null) {
+		$name = (string) $name;
+		if ( '' !== $name ) {
+			$templates[] = "{$slug}-{$name}.php";
+		}
+		$templates[] = "{$slug}.php";
+		foreach ( (array) $templates as $template_name ) {
+			if ( ! $template_name ) {
+					continue;
+			}
+			// If the Theme Has a kind_views directory look there first.
+			if ( file_exists( get_template_directory() . '/kind_views/' . $template_name ) ) {
+				$located = get_template_directory() . '/kind_views/' . $template_name;
+				break;
+			}
+			// Look in the views subdirectory.
+			if ( file_exists( plugin_dir_path( __FILE__ ) . 'views/' . $template_name ) ) {
+				$located = plugin_dir_path( __FILE__ ) . 'views/' . $template_name;
+				break;
+			}
+		}
+		ob_start();
+		include ( $located );
+		$return  = ob_get_contents();
+		ob_end_clean();
+		return $return;
 	}
 
 
-	public static function sanitize_output( $content ) {
-		$allowed = wp_kses_allowed_html( 'post' );
-		$options = get_option( 'iwt_options', Kind_Config::Defaults() );
-		if ( array_key_exists( 'contentelements',$options ) && json_decode( $options['contentelements'] ) != null ) {
-			$allowed = json_decode( $options['contentelements'], true );
+	// Return the Display
+	public static function get_display( $post_ID ) {
+		if ( 'post' === get_post_type( $post_ID ) ) {
+			$kind = get_post_kind_slug( $post_ID );
+			$content = self::get_view_part( 'kind', $kind );
+			return apply_filters( 'kind-response-display', $content, $post_ID );
 		}
+	}
+
+	// Echo the output of get_display
+	public static function display( ) {
+		echo self::get_display( );
+	}
+
+	public static function content_response ( $content ) {
+		return self::get_display( get_the_ID() ) . $content;
+	}
+
 
-		if ( ifset( $options[ 'protection' ] ) ) {
-			return $content;
+	public static function excerpt_response ( $content ) {
+		global $post;
+		if ( has_excerpt( get_the_ID() ) ) {
+			return self::get_display( get_the_ID() ) . get_the_excerpt();
+		} else {
+			return self::get_display( get_the_ID() ) . wp_trim_words( $post->post_content );
 		}
-		return wp_kses( ( string ) $content ,$allowed );
 	}
 
+	public static function extract_domain_name( $url ) {
+		$parse = wp_parse_url( $url, PHP_URL_HOST );
+		return preg_replace( '/^www\./', '', $parse );
+	}
+
+
 	// Take an array of attributes and output them as a string
 	public static function get_attributes( $classes = null ) {
 		if ( ! $classes ) {
@@ -55,33 +100,31 @@ public static function get_url_link( $url, $name='', $atr='' ) {
 		return $return;
 	}
 
-	public static function get_formatted( $field, $attr ) {
+	public static function get_formatted( $field, $attr, $type = 'span' ) {
 		if ( ! isset( $field ) ) {
 			return $string;
 		}
-		$string = '<span ' . $attr . '>' . $field . '</span>';
+		$string = '<' . $type . $attr . '>' . $field . '</' . $type . '>';
 		return $string;
 	}
 
-
-
 	public static function get_embed( $url ) {
-			$options = get_option( 'iwt_options', Kind_Config::Defaults() );
-		if ( $options['embeds'] == 0 ) {
+		$option = get_option( 'kind_embeds' );
+		if ( 0 == $option ) {
 				return '';
 		}
+		$host = self::extract_domain_name( $url );
+		$whitelist = array( 
+			'animoto.com', 'blip.tv', 'cloudup.com', 'collegehumor.com', 'dailymotion.com', 'facebook.com', 'flickr.com', 'funnyordie.com', 'hulu.com', 'imgur.com', 'instagram.com', 
+			'issuu.com', 'kickstarter.com', 'meetup.com', 'mixcloud.com', 'photobucket.com', 'polldaddy.com', 'reddit.com', 'reverbnation.com', 'scribd.com', 'slideshare.net', 'smugmug.com',
+			'soundcloud.com', 'speakerdeck.com', 'spotify.com', 'ted.com', 'tumblr.com', 'twitter.com', 'videopress.com', 'vimeo.com', 'wordpress.tv', 'youtube.com'
+		);
+		$whitelist = apply_filters( 'post_kind_embed_whitelist', $whitelist );
+		if ( ! in_array( $host, $whitelist ) ) {
+			return '';
+		}
 		if ( isset( $GLOBALS['wp_embed'] ) ) {
 			$embed = $GLOBALS['wp_embed']->autoembed( $url );
-		}
-			// Passes through the oembed handler in WordPress
-			$host = self::extract_domain_name( $url );
-		switch ( $host ) {
-			case 'facebook.com':
-				$embed = self::get_embed_facebook( $url );
-				break;
-			case 'plus.google.com':
-				$embed = self::get_embed_gplus( $url );
-				break;
 		}
 		if ( strcmp( $embed, $url ) == 0 ) {
 			$embed = '';
@@ -91,70 +134,6 @@ public static function get_embed( $url ) {
 			return $embed;
 	}
 
-	public static function get_embed_facebook ( $url ) {
-		$embed = '<div id="fb-root"></div>';
-		$embed .= '<script>(function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; js.src = "//connect.facebook.net/en_US/all.js#xfbml=1"; fjs.parentNode.insertBefore(js, fjs); }(document, \'script\', \'facebook-jssdk\'));</script>';
-		$embed .= '<div class="fb-post" data-href="' . esc_url( $url ) . '" data-width="466"><div class="fb-xfbml-parse-ignore"><a href="' . esc_url( $url ) .  '">Post</a></div></div>';
-		return $embed;
-	}
-	public static function get_embed_gplus ( $url ) {
-		$embed = '<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>';
-		$embed .= '<div class="g-post" data-href="' . esc_url( $url ) . '"></div>';
-		return $embed;
-	}
-
-	public static function content_response ( $content ) {
-		return self::get_display( get_the_ID(), is_single() ) . $content;
-	}
-
-
-	public static function excerpt_response ( $content ) {
-		global $post;
-		if ( has_excerpt( get_the_ID() ) ) {
-			return self::get_display( get_the_ID(), is_single() ) . get_the_excerpt();
-		} else {
-			return self::get_display( get_the_ID(), is_single() ) . wp_trim_words( $post->post_content );
-		}
-	}
-
-	// This mirrors get_template_part but for views and locates the correct file
-	public static function get_view_part($slug, $name = null) {
-		$name = (string) $name;
-		if ( '' !== $name ) {
-			$templates[] = "{$slug}-{$name}.php";
-		}
-		$templates[] = "{$slug}.php";
-		foreach ( (array) $templates as $template_name ) {
-			if ( ! $template_name ) {
-					continue;
-			}
-			// If the Theme Has a kind_views directory look there first.
-			if ( file_exists( get_template_directory() . '/kind_views/' . $template_name ) ) {
-				$located = get_template_directory() . '/kind_views/' . $template_name;
-				break;
-			}
-			// Look in the views subdirectory.
-			if ( file_exists( plugin_dir_path( __FILE__ ) . 'views/' . $template_name ) ) {
-				$located = plugin_dir_path( __FILE__ ) . 'views/' . $template_name;
-				break;
-			}
-		}
-		return $located;
-	}
-
-	// Return the Display
-	public static function get_display( $post_ID, $single = false ) {
-		if ( 'post' === get_post_type( $post_ID ) ) {
-			$meta = new Kind_Meta( $post_ID );
-			$kind = get_post_kind_slug( $post_ID );
-			$cite = $meta->get_cite();
-			$hcard = 'Unknown Author';
-			$content = '';
-			include( self::get_view_part( 'kind', $kind ) );
-			return apply_filters( 'kind-response-display', $content, $post_ID );
-		}
-	}
-
 	/**
 	 * Returns an array of domains with the post type terminologies
 	 *
@@ -190,19 +169,19 @@ public static function get_post_type_string($url) {
 	 */
 	public static function get_hcard($author, $args = null) {
 		$default = array(
-										'height' => 32,
-										'width' => 32,
-										'display' => 'both',
-					 );
+			'height' => 32,
+			'width' => 32,
+			'display' => 'both'
+		);
 		$args = wp_parse_args( $args, $default );
 		/**
-	 * Filter for alternate retrieval types
-	 *
-	 * This could be using WordPress's gravatar system, retrieval by pure URL, etc.
-	 *
+		 * Filter for alternate retrieval types
+		 *
+		 * This could be using WordPress's gravatar system, retrieval by pure URL, etc.
+		 *
 		 * @param string|boolean $author Defaults to false, but may return string.
 		 * @param mixed  $author Data on the author, type optional. Defaults to array.
-	 * @param array  $args        Arguments passed to get_hcard.
+		 * @param array  $args        Arguments passed to get_hcard.
 		 */
 		$author = apply_filters( 'get_hcard_data', $author, $args );
 		// If it didn't return an array as expected, then there is no valid author data.
@@ -210,12 +189,12 @@ public static function get_hcard($author, $args = null) {
 			return false;
 		}
 		/**
-	 * Filter for alternate presentation
-	 *
-	 * @param string|boolean $card Defaults to false, but may return string.
-	 * @param mixed  $author Data on the author, type optional. Defaults to array.
-	 * @param array  $args        Arguments passed to get_hcard.
-	 */
+		 * Filter for alternate presentation
+		 *
+		 * @param string|boolean $card Defaults to false, but may return string.
+		 * @param mixed  $author Data on the author, type optional. Defaults to array.
+		 * @param array  $args        Arguments passed to get_hcard.
+		 */
 		$card = apply_filters( 'get_hcard', '', $author, $args );
 		if ( ! empty( $card ) ) {
 			return $card;
@@ -224,12 +203,12 @@ public static function get_hcard($author, $args = null) {
 		switch ( $args['display'] ) {
 			case 'photo':
 				if ( ! array_key_exists( 'photo', $author ) ) {
-						return false;
+					return false;
 				}
 				if ( ! array_key_exists( 'url', $author ) ) {
-						return sprintf( '<img src="%1s" class="h-card u-photo p-author" alt="%2s" width=%3s height=%4s />', $author['photo'], $author['name'], $args['width'], $args['height'] );
+					return sprintf( '<img src="%1s" class="h-card u-photo p-author" alt="%2s" width=%3s height=%4s />', $author['photo'], $author['name'], $args['width'], $args['height'] );
 				} else {
-						return sprintf( '<a class="h-card p-author" href="%1s"><img class="u-photo" src="%2s" alt="%3s" width=%4s height=%5s /></a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'] );
+					return sprintf( '<a class="h-card p-author" href="%1s"><img class="u-photo" src="%2s" alt="%3s" width=%4s height=%5s /></a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'] );
 				}
 				break;
 			case 'name':
@@ -274,27 +253,11 @@ public static function get_site_name($cite, $url) {
 		if ( ! $cite ) {
 			return false;
 		}
-		if ( ! empty( $url ) ) {
-			if ( ! array_key_exists( 'publication', $cite ) ) {
-				$cite['publication'] = Link_Preview::pretty_domain_name( $cite['url'] );
-			}
-		} else {
-			if ( ! array_key_exists( 'publication', $cite ) ) {
-				   return false;
-			}
+		if ( ! array_key_exists( 'publication', $cite ) ) {
+			return false;
 		}
 		return sprintf( '<span class="p-publication">%1s</span>', $cite['publication'] );
 	}
 
 
-	// Echo the output of get_display
-	public static function display( ) {
-		echo self::get_display( );
-	}
-
 }  // End Class
-
-
-function kind_response_display() {
-	echo apply_filters( 'kind_response_display', '' );
-}
diff --git a/includes/class-link-preview.php b/includes/class-link-preview.php
index 9f485a1..0199c8a 100755
--- a/includes/class-link-preview.php
+++ b/includes/class-link-preview.php
@@ -7,75 +7,64 @@
 
 class Link_Preview {
 	public static function init() {
-		add_action( 'wp_ajax_kind_urlfetch', array( 'Link_Preview', 'urlfetch' ) );
+		add_action( 'rest_api_init', array( 'Link_Preview', 'register_routes' ) );
 	}
 
-	public static function extract_domain_name( $url ) {
-		$parse = wp_parse_url( $url, PHP_URL_HOST );
-		return preg_replace( '/^www\./', '', $parse );
+	/**
+	 * Register the Route.
+	 */
+	public static function register_routes() {
+		register_rest_route( 'link-preview/1.0', '/parse', array(
+			array(
+				'methods' => WP_REST_Server::READABLE,
+				'callback' => array( 'Link_Preview', 'parse' ),
+				'args'  => array(
+					'kindurl'  => array( 
+						'required' => true,
+						'validate_callback' => array( 'Link_Preview', 'is_valid_url' ),
+						'sanitize_callback' => 'esc_url_raw'
+					),
+				),
+				'permission_callback' => function () {
+					return current_user_can( 'edit_posts' );
+				}
+			),
+		) );
 	}
 
-
 	/**
-	 * Returns if valid URL
+	 * Returns if valid URL for REST validation
 	 *
 	 * @param string $url
 	 *
 	 * @return boolean
 	 */
-	public static function is_valid_url($url) {
+	public static function is_valid_url($url, $request, $key) {
+		if ( ! is_string( $url ) || empty( $url ) ) {
+			return false;
+		}
 		return filter_var( $url, FILTER_VALIDATE_URL );
 	}
 
-	/**
-	 * Retrieves the body of a URL for parsing.
-	 *
-	 * @param string $url A valid URL.
-	 */
-	private static function fetch($url) {
-		global $wp_version;
-		if ( ! isset( $url ) || filter_var( $url, FILTER_VALIDATE_URL ) === false ) {
-			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
-		}
-		$args = array(
-			'timeout' => 10,
-			'limit_response_size' => 1048576,
-			'redirection' => 20,
-			// Use an explicit user-agent for Post Kinds
-			'user-agent' => 'Post Kinds (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' ),
-		);
-		$response = wp_safe_remote_head( $url, $args );
-		if ( is_wp_error( $response ) ) {
-			return $response;
-		}
-		if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' ) ) ) {
-			return new WP_Error( 'content-type', 'Content Type is Media' );
-		}
-		$response = wp_safe_remote_get( $url, $args );
-		$body = wp_remote_retrieve_body( $response );
-		return $body;
-	}
 	/**
 	 * Parses marked up HTML.
 	 *
 	 * @param string $content HTML marked up content.
 	 */
-	private static function parse ($content, $url) {
-		$metadata = self::metaparse( $content );
+	private static function mergeparse ($content, $url) {
+		if ( empty( $content ) || empty( $url ) ) {
+			return array();
+		}
+		$parsethis = new Parse_This();
+		$parsethis->set_source( $content, $url );
+		$metadata = $parsethis->meta_to_microformats();
 		if ( version_compare( PHP_VERSION, '5.3', '>' ) ) {
-			$mf2data = self::mf2parse( $content, $url );
+			$mf2data = Parse_MF2::mf2parse( $content, $url );
 			$data = array_merge( $metadata, $mf2data );
 			$data = array_filter( $data );
 		} else {
 			$data = $metadata;
 		}
-		// If Publication is Not Set, use the domain name instead
-		$data['publication'] = ifset( $data['publication'] ) ?: self::pretty_domain_name( $url );
-		// If Name is Not Set Use Title Tag
-		if ( ! isset( $data['name'] ) ) {
-			preg_match( '/<title>(.+)<\/title>/i', $content, $match );
-			$data['name'] = trim( $match[1] );
-		}
 
 		if ( ! isset( $data['summary'] ) ) {
 			$data['summary'] = substr( $data['content']['text'], 0, 300 );
@@ -101,227 +90,18 @@ private static function parse ($content, $url) {
 		return apply_filters( 'kind_parse_data', $data, $content, $url );
 	}
 
-	// Give a Proper Name for Set Sites
-	public static function pretty_domain_name( $url ) {
-		switch ( $url ) {
-			case 'twitter.com':
-			return  _( 'Twitter', 'Post kinds' );
-			break;
-			default:
-			return self::extract_domain_name( $url );
-		}
-	}
-
-	public static function urlfetch() {
-		global $wpdb;
-		if ( empty( $_POST['kind_url'] ) ) {
-				wp_send_json_error( new WP_Error( 'nourl', __( 'You must specify a URL' ) ) );
-		}
-		if ( filter_var( $_POST['kind_url'], FILTER_VALIDATE_URL ) === false ) {
-				wp_send_json_error( new WP_Error( 'badurl', __( 'Input is not a valid URL' ) ) );
-		}
-
-		$content = self::fetch( $_POST['kind_url'] );
-		if ( is_wp_error( $content ) ) {
-			wp_send_json_error( $response );
-		}
-		wp_send_json_success( self::parse( $content, $_POST['kind_url'] ) );
-	}
-
-	/*
-	Parses marked up HTML using MF2.
-	*
-	* @param string $content HTML marked up content.
-	*/
-	private static function mf2parse($content, $url) {
-		$host = self::extract_domain_name( $url );
-		switch ( $host ) {
-			case 'twitter.com':
-				$parsed = Mf2\Shim\parseTwitter( $content, $url );
-				break;
-			default:
-				$parsed = Mf2\parse( $content, $url );
-		}
-		if ( ! is_array( $parsed ) ) {
-			return array();
-		}
-		$count = count( $parsed['items'] );
-		if ( 0 == $count ) {
-			return array();
-		}
-		if ( 1 == $count ) {
-			$item = $parsed['items'][0];
-			if ( in_array( 'h-feed', $item['type'] ) ) {
-				return array( 'type' => 'feed' );
-			}
-			if ( in_array( 'h-card', $item['type'] ) ) {
-				return self::parse_hcard( $item, $parsed, $url );
-			} elseif ( in_array( 'h-entry', $item['type'] ) || in_array( 'h-cite', $item['type'] ) ) {
-				return self::parse_hentry( $item, $parsed );
-			}
-		}
-		foreach ( $parsed['items'] as $item ) {
-			if ( array_key_exists( 'url', $item['properties'] ) ) {
-				$urls = $item['properties']['url'];
-				if ( in_array( $url, $urls ) ) {
-					if ( in_array( 'h-card', $item['type'] ) ) {
-						return self::parse_hcard( $item, $parsed, $url );
-					} elseif ( in_array( 'h-entry', $item['type'] ) || in_array( 'h-cite', $item['type'] ) ) {
-						return self::parse_hentry( $item, $parsed );
-					}
-				}
-			}
-		}
-	}
-
-	private static function parse_hentry( $entry, $mf ) {
-		// Array Values
-		$properties = array( 'category', 'invitee', 'photo','video','audio','syndication','in-reply-to','like-of','repost-of','bookmark-of', 'tag-of' );
-		$data = Mf2_Cleaner::get_prop_array( $entry, $properties );
-		$data['type'] = 'entry';
-		$data['published'] = Mf2_Cleaner::get_published( $entry );
-		$data['updated'] = Mf2_Cleaner::get_updated( $entry );
-		$properties = array( 'url', 'rsvp', 'featured', 'name' );
-		foreach ( $properties as $property ) {
-			$data[ $property ] = Mf2_Cleaner::get_plaintext( $entry, $property );
-		}
-		$data['content'] = Mf2_Cleaner::parse_html_value( $entry, 'content' );
-		$data['summary'] = Mf2_Cleaner::get_summary( $entry, $data['content'] );
-		if ( isset( $data['name'] ) ) {
-			$data['name'] = trim( preg_replace( '/https?:\/\/([^ ]+|$)/', '', $data['name'] ) );
-		}
-		if ( isset( $mf['rels']['syndication'] ) ) {
-			if ( isset( $data['syndication'] ) ) {
-				$data['syndication'] = array_unique( array_merge( $data['syndication'], $mf['rels']['syndication'] ) );
-			} else {
-				$data['syndication'] = $mf['rels']['syndication'];
-			}
-		}
-		$author = Mf2_Cleaner::find_author( $entry, $mf );
-		if ( $author ) {
-			if ( is_array( $author['type'] ) ) {
-				$data['author'] = self::parse_hcard( $author, $mf );
-			} else {
-				$author = array_filter( $author );
-				if ( ! isset( $author['name'] ) && isset( $author['url'] ) ) {
-					$content = self::fetch( $author['url'] );
-					$parsed = Mf2\parse( $content, $author['url'] );
-					$hcard = self::find_microformat( $parsed, 'h-card' );
-					$data['author'] = self::parse_hcard( $hcard, $parsed, $author['url'] );
-				} else {
-					$data['author'] = $author;
-				}
-			}
-		}
-		$data = array_filter( $data );
-		if ( array_key_exists( 'name', $data ) ) {
-			if ( ! array_key_exists( 'summary', $data ) || ! array_key_exists( 'content', $data ) ) {
-				unset( $data['name'] );
-			}
-		}
-		return $data;
-	}
-
-	private static function parse_hcard( $hcard, $mf, $authorurl = false ) {
-		// If there is a matching author URL, use that one
-		$data = array(
-			'type' => 'card',
-			'name' => null,
-			'url' => null,
-			'photo' => null,
-		);
-		$properties = [ 'url','name','photo' ];
-		foreach ( $properties as $p ) {
-			if ( 'url' == $p && $authorurl ) {
-				// If there is a matching author URL, use that one
-				$found = false;
-				foreach ( $hcard['properties']['url'] as $url ) {
-					if ( Mf2_Cleaner::is_url( $url ) ) {
-						if ( $url == $authorurl ) {
-							$data['url'] = $url;
-							$found = true;
-						}
-					}
-				}
-				if ( ! $found && Mf2_Cleaner::is_url( $hcard['properties']['url'][0] ) ) {
-					$data['url'] = $hcard['properties']['url'][0];
-				}
-			} else if ( ( $v = Mf2_Cleaner::get_plaintext( $hcard, $p ) ) !== null ) {
-				// Make sure the URL property is actually a URL
-				if ( 'url' == $p || 'photo' == $p ) {
-					if ( Mf2_Cleaner::is_url( $v ) ) {
-						$data[ $p ] = $v;
-					}
-				} else {
-					$data[ $p ] = $v;
-				}
-			}
+	// Callback Handler
+	public static function parse( $request ) {
+		// We don't need to specifically check the nonce like with admin-ajax. It is handled by the API.
+		$params = $request->get_params();
+		if ( isset( $params['kindurl'] ) && ! empty( $params['kindurl' ] ) ) {
+			$content = Parse_Mf2::fetch( $params['kindurl'] );
+			return self::mergeparse( $content, $params['kindurl'] );
 		}
-		return array_filter( $data );
+		return new WP_Error( 'invalid_url' , __( 'Missing or Invalid URL' , 'indieweb-post-kinds' ), array( 'status' => 400 ) );
 	}
+		        
 
 
-
-	public static function get_meta_tags( $source_content ) {
-		if ( ! $source_content ) {
-			return null;
-		}
-		$meta = array();
-		if ( preg_match_all( '/<meta [^>]+>/', $source_content, $matches ) ) {
-			$items = $matches[0];
-
-			foreach ( $items as $value ) {
-				if ( preg_match( '/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches ) ) {
-					$meta_name  = $new_matches[2];
-					$meta_value = $new_matches[3];
-
-					// Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
-					if ( strlen( $meta_name ) > 100 ) {
-						continue;
-					}
-					$meta[ $meta_name ] = $meta_value;
-				}
-			}
-		}
-		return $meta;
-	}
-
-	/**
-	 * Parses marked up HTML using OGP or other meta tags.
-	 *
-	 * @param string $content HTML marked up content.
-	 */
-	private static function metaparse($content) {
-		$meta = self::get_meta_tags( $content );
-		$data = array();
-		$data['name'] = ifset( $meta['og:title'] ) ?: ifset( $meta['twitter:title'] ) ?: ifset( $meta['og:music:song'] );
-		$data['summary'] = ifset( $meta['og:description'] ) ?: ifset( $meta['twitter:description'] ) ?: ifset( $meta['description'] );
-		$data['site'] = ifset( $meta['og:site'] ) ?: ifset( $meta['twitter:site'] );
-		if ( array_key_exists( 'author', $meta ) ) {
-			$data['author'] = array();
-			$data['author']['name'] = $meta['author'];
-		}
-		$data['featured'] = ifset( $meta['og:image'] ) ?: ifset( $meta['twitter:image'] );
-		$data['publication'] = ifset( $meta['og:site_name'] ) ?: ifset( $meta['og:music:album'] );
-		$data['published'] = ifset( $meta['article:published'] ) ?: ifset( $meta['og:article:published_time'] ) ?: ifset( $meta['og:article:published'] ) ?: ifset( $meta['og:music:release_date'] ) ?: ifset( $meta['og:video:release_date'] );
-		$data['updated'] = ifset( $meta['article:modified'] ) ?: ifset( $meta['article:modified_time'] );
-		$metatags = ifset( $meta['article:tag'] ) ?: ifset( $meta['og:video:tag'] );
-		$tags = array();
-		if ( is_array( $metatags ) ) {
-			foreach ( $metatags as $tag ) {
-				$tags[] = str_replace( ',', ' -', $tag );
-			}
-			$tags = array_filter( $tags );
-		}
-		$data['tags'] = ifset( $data['tags'] ) ?: implode( ',' ,$tags );
-		// Extended Parameters
-		$data['audio'] = ifset( $meta['og:audio'] );
-		$data['video'] = ifset( $meta['og:video'] );
-		$data['duration'] = ifset( $meta['music:duration'] ) ?: ifset( $meta['video:duration'] );
-		$data['type'] = ifset( $meta['og:type'] );
-		$data['icon'] = ifset( $meta['msapplication-TileImage'] );
-		$data['meta'] = array_filter( $meta );
-		return array_filter( $data );
-	}
 }
 ?>
diff --git a/includes/class-mf2-cleaner.php b/includes/class-parse-mf2.php
similarity index 78%
rename from includes/class-mf2-cleaner.php
rename to includes/class-parse-mf2.php
index 1655274..700ab67 100644
--- a/includes/class-mf2-cleaner.php
+++ b/includes/class-parse-mf2.php
@@ -6,7 +6,31 @@
  * and https://github.com/pfefferle/wordpress-semantic-linkbacks/blob/master/includes/class-linkbacks-mf2-handler.php
  **/
 
-class Mf2_Cleaner {
+class Parse_MF2 {
+
+	public static function fetch($url) {
+		global $wp_version;
+		if ( ! isset( $url ) || ! self::is_url( $url ) ) {
+			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+		}
+		$args = array(
+			'timeout' => 10,
+			'limit_response_size' => 1048576,
+			'redirection' => 20,
+			// Use an explicit user-agent for Post Kinds
+			'user-agent' => 'Post Kinds (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' ),
+		);
+		$response = wp_safe_remote_head( $url, $args );
+		if ( is_wp_error( $response ) ) {
+			return $response;
+		}
+		if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' ) ) ) {
+			return new WP_Error( 'content-type', 'Content Type is Media' );
+		}
+		$response = wp_safe_remote_get( $url, $args );
+		$body = wp_remote_retrieve_body( $response );
+		return $body;
+	}
 
 	/**
 	 * Is string a URL.
@@ -177,7 +201,7 @@ public static function get_plaintext(array $mf, $propName, $fallback = null) {
 	 */
 	public static function get_plaintext_array(array $mf, $propName, $fallback = null) {
 		if ( ! empty( $mf['properties'][$propName] ) and is_array( $mf['properties'][$propName] ) ) {
-			return array_map( array( 'Mf2_Cleaner', 'to_plaintext' ), $mf['properties'][$propName] ); }
+			return array_map( array( 'Parse_Mf2', 'to_plaintext' ), $mf['properties'][$propName] ); }
 		return $fallback;
 	}
 
@@ -645,4 +669,147 @@ public static function find_microformats_by_callable(array $mfs, $callable, $fla
 		return array_values( array_filter( $mfs, $callable ) );
 	}
 
+	/* Parses marked up HTML using MF2.
+	*
+	* @param string $content HTML marked up content.
+	*/
+	public static function mf2parse($content, $url) {
+		$host = wp_parse_url( $url, PHP_URL_HOST );
+		switch ( $host ) {
+			case 'twitter.com':
+			case 'www.twitter.com':
+				$parsed = Mf2\Shim\parseTwitter( $content, $url );
+				break;
+			default:
+				$parsed = Mf2\parse( $content, $url );
+		}
+		if ( ! is_array( $parsed ) ) {
+			return array();
+		}
+		$count = count( $parsed['items'] );
+		if ( 0 == $count ) {
+			return array();
+		}
+		if ( 1 == $count ) {
+			$item = $parsed['items'][0];
+			if ( in_array( 'h-feed', $item['type'] ) ) {
+				return array( 'type' => 'feed' );
+			}
+			if ( in_array( 'h-card', $item['type'] ) ) {
+				return self::parse_hcard( $item, $parsed, $url );
+			} elseif ( in_array( 'h-entry', $item['type'] ) || in_array( 'h-cite', $item['type'] ) ) {
+				return self::parse_hentry( $item, $parsed );
+			}
+		}
+		foreach ( $parsed['items'] as $item ) {
+			if ( array_key_exists( 'url', $item['properties'] ) ) {
+				$urls = $item['properties']['url'];
+				if ( in_array( $url, $urls ) ) {
+					if ( in_array( 'h-card', $item['type'] ) ) {
+						return self::parse_hcard( $item, $parsed, $url );
+					} elseif ( in_array( 'h-entry', $item['type'] ) || in_array( 'h-cite', $item['type'] ) ) {
+						return self::parse_hentry( $item, $parsed );
+					}
+				}
+			}
+		}
+	}
+
+	private static function parse_hentry( $entry, $mf ) {
+		// Array Values
+		$properties = array( 'category', 'invitee', 'photo','video','audio','syndication','in-reply-to','like-of','repost-of','bookmark-of', 'tag-of' );
+		$data = self::get_prop_array( $entry, $properties );
+		$data['type'] = 'entry';
+		$data['published'] = self::get_published( $entry );
+		$data['updated'] = self::get_updated( $entry );
+		$properties = array( 'url', 'rsvp', 'featured', 'name' );
+		foreach ( $properties as $property ) {
+			$data[ $property ] = self::get_plaintext( $entry, $property );
+		}
+		$data['content'] = self::parse_html_value( $entry, 'content' );
+		$data['summary'] = self::get_summary( $entry, $data['content'] );
+		if ( isset( $data['name'] ) ) {
+			$data['name'] = trim( preg_replace( '/https?:\/\/([^ ]+|$)/', '', $data['name'] ) );
+		}
+		if ( isset( $mf['rels']['syndication'] ) ) {
+			if ( isset( $data['syndication'] ) ) {
+				$data['syndication'] = array_unique( array_merge( $data['syndication'], $mf['rels']['syndication'] ) );
+			} else {
+				$data['syndication'] = $mf['rels']['syndication'];
+			}
+		}
+		$author = self::find_author( $entry, $mf );
+		if ( $author ) {
+			if ( is_array( $author['type'] ) ) {
+				$data['author'] = self::parse_hcard( $author, $mf );
+			} else {
+				$author = array_filter( $author );
+				if ( ! isset( $author['name'] ) && isset( $author['url'] ) ) {
+					$content = self::fetch( $author['url'] );
+					$parsed = Mf2\parse( $content, $author['url'] );
+					$hcard = self::find_microformats_by_type( $parsed, 'h-card' );
+					if ( is_array( $hcard ) && ! empty( $hcard ) ) {
+						$hcard = $hcard[0];
+					}
+					$data['author'] = self::parse_hcard( $hcard, $parsed, $author['url'] );
+				} else {
+					$data['author'] = $author;
+				}
+			}
+		}
+		$data = array_filter( $data );
+		if ( array_key_exists( 'name', $data ) ) {
+			if ( ! array_key_exists( 'summary', $data ) || ! array_key_exists( 'content', $data ) ) {
+				unset( $data['name'] );
+			}
+		}
+		if ( isset( $data['name'] ) && isset( $data['summary'] ) ) {
+			if ( $data['name'] == $data[ 'summary' ] ) {
+				unset( $data['name'] );
+			}
+		}
+		return $data;
+	}
+
+	private static function parse_hcard( $hcard, $mf, $authorurl = false ) {
+		// If there is a matching author URL, use that one
+		$data = array(
+			'type' => 'card',
+			'name' => null,
+			'url' => null,
+			'photo' => null,
+		);
+		$properties = [ 'url','name','photo' ];
+		foreach ( $properties as $p ) {
+			if ( 'url' == $p && $authorurl ) {
+				// If there is a matching author URL, use that one
+				$found = false;
+				foreach ( $hcard['properties']['url'] as $url ) {
+					if ( self::is_url( $url ) ) {
+						if ( $url == $authorurl ) {
+							$data['url'] = $url;
+							$found = true;
+						}
+					}
+				}
+				if ( ! $found && self::is_url( $hcard['properties']['url'][0] ) ) {
+					$data['url'] = $hcard['properties']['url'][0];
+				}
+			} else if ( ( $v = self::get_plaintext( $hcard, $p ) ) !== null ) {
+				// Make sure the URL property is actually a URL
+				if ( 'url' == $p || 'photo' == $p ) {
+					if ( self::is_url( $v ) ) {
+						$data[ $p ] = $v;
+					}
+				} else {
+					$data[ $p ] = $v;
+				}
+			}
+		}
+		return array_filter( $data );
+	}
+
+
+
+
 }
diff --git a/includes/class-parse-this.php b/includes/class-parse-this.php
new file mode 100644
index 0000000..a20f2c0
--- /dev/null
+++ b/includes/class-parse-this.php
@@ -0,0 +1,726 @@
+<?php
+/**
+ * Parse This class.
+ * Derived from the Press This Class with Enhancements.
+ *
+ * @package WordPress
+ * @subpackage Press_This
+ * @since x.x.x
+ */
+
+/**
+ * Parse This class.
+ *
+ * @since x.x.x
+ */
+class Parse_This {
+	private $images = array();
+
+	private $embeds = array();
+
+	private $links = array();
+
+	private $meta = array();
+
+	private $urls = array();
+
+	private $url = '';
+
+	private $domain = '';
+
+	private $content = '';
+
+	/**
+	 * Constructor.
+	 *
+	 * @since x.x.x
+	 * @access public
+	 *
+	 */
+	public function __construct( $url = null ) {
+		if ( $this->is_url( $url ) ) {
+			$this->url = $url;
+			$this->fetch_source_html( $url );
+		}
+	}
+
+	/**
+	 * Get the source's images and save them locally, for posterity, unless we can't.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param int    $post_id Post ID.
+	 * @param string $content Optional. Current expected markup for Press This. Expects slashed. Default empty.
+	 * @return string New markup with old image URLs replaced with the local attachment ones if swapped.
+	 */
+	public function side_load_images( $post_id, $content = '' ) {
+		$content = wp_unslash( $content );
+
+		if ( preg_match_all( '/<img [^>]+>/', $content, $matches ) && current_user_can( 'upload_files' ) ) {
+			foreach ( (array) $matches[0] as $image ) {
+				// This is inserted from our JS so HTML attributes should always be in double quotes.
+				if ( ! preg_match( '/src="([^"]+)"/', $image, $url_matches ) ) {
+					continue;
+				}
+
+				$image_src = $url_matches[1];
+
+				// Don't try to sideload a file without a file extension, leads to WP upload error.
+				if ( ! preg_match( '/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src ) ) {
+					continue;
+				}
+
+				// Sideload image, which gives us a new image src.
+				$new_src = media_sideload_image( $image_src, $post_id, null, 'src' );
+
+				if ( ! is_wp_error( $new_src ) ) {
+					// Replace the POSTED content <img> with correct uploaded ones.
+					// Need to do it in two steps so we don't replace links to the original image if any.
+					$new_image = str_replace( $image_src, $new_src, $image );
+					$content = str_replace( $image, $new_image, $content );
+				}
+			}
+		}
+
+		// Expected slashed
+		return wp_slash( $content );
+	}
+
+	/**
+	 * Sets the source's HTML externally.
+	 *
+	 * @since x.x.x
+	 * @access public
+	 *
+	 * @param string $source_content HTML source content.
+	 * @param string $url Source URL
+	 */
+	public function set_source( $source_content, $url ) {
+		if ( is_string( $source_content ) ) {
+			$this->content = $source_content;
+		}
+		if ( $this->is_url( $url ) ) {
+			$this->url = $url;
+			$this->domain = wp_parse_url( $url, PHP_URL_HOST );
+		}
+		$this->source_data_parse();
+	}
+
+	/**
+	 * Downloads the source's HTML via server-side call for the given URL.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 * @param string $url URL to scan.
+	 * @return WP_Error|boolean WP_Error if invalid and true if successful
+	 */
+	public function fetch_source_html( $url ) {
+		if ( empty( $url ) ) {
+			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+		}
+
+		$args = array(
+			'timeout' => 30,
+			'limit_response_size' => 1048576,
+			'redirection' => 5,
+			// Use an explicit user-agent for Press This
+			'user-agent' => 'Parse This (WordPress/' . get_bloginfo( 'version' ) . '); ' . get_bloginfo( 'url' )
+		);
+		$remote_url = wp_safe_remote_head( $url, $args );
+		if ( is_wp_error( $remote_url ) ) {
+			return $remote_url;
+		}
+		if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' ) ) ) {
+			return new WP_Error( 'content-type', 'Content Type is Media' );
+		}
+
+		$remote_url = wp_safe_remote_get( $url, $args );
+		$this->domain = wp_parse_url( $url, PHP_URL_HOST );
+		$this->content = wp_remote_retrieve_body( $remote_url );
+		$this->source_data_parse();
+		return true;
+	}
+
+	/**
+	 * Is string a URL.
+	 *
+	 * @param array $url
+	 * @return bool
+	 */
+	public function is_url( $url ) {
+		return preg_match( '/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url );
+	}
+
+	/**
+	 * Utility method to limit an array to 100 values.
+	 * Originally set to 50 but some sites are very detailed in their meta.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param array $value Array to limit.
+	 * @return array Original array if fewer than 100 values, limited array, empty array otherwise.
+	 */
+	private function _limit_array( $value ) {
+		if ( is_array( $value ) ) {
+			if ( count( $value ) > 100 ) {
+				return array_slice( $value, 0, 100 );
+			}
+
+			return $value;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Utility method to limit the length of a given string to 5,000 characters.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $value String to limit.
+	 * @return bool|int|string If boolean or integer, that value. If a string, the original value
+	 *                         if fewer than 5,000 characters, a truncated version, otherwise an
+	 *                         empty string.
+	 */
+	private function _limit_string( $value ) {
+		$return = '';
+
+		if ( is_numeric( $value ) || is_bool( $value ) ) {
+			$return = $value;
+		} else if ( is_string( $value ) ) {
+			if ( mb_strlen( $value ) > 5000 ) {
+				$return = mb_substr( $value, 0, 5000 );
+			} else {
+				$return = $value;
+			}
+
+			$return = html_entity_decode( $return, ENT_QUOTES, 'UTF-8' );
+			$return = sanitize_text_field( trim( $return ) );
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Utility method to limit a given URL to 2,048 characters.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $url URL to check for length and validity.
+	 * @return string Escaped URL if of valid length (< 2048) and makeup. Empty string otherwise.
+	 */
+	private function _limit_url( $url ) {
+		if ( ! is_string( $url ) ) {
+			return '';
+		}
+
+		// HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048.
+		if ( strlen( $url ) > 2048 ) {
+			return ''; // Return empty rather than a truncated/invalid URL
+		}
+
+		// Does not look like a URL.
+		if ( ! $this->is_url( $url ) ) {
+			return '';
+		}
+
+		// If the URL is root-relative, prepend the protocol and domain name
+		if ( $url && $this->domain && preg_match( '%^/[^/]+%', $url ) ) {
+			$url = $this->domain . $url;
+		}
+
+		// Not absolute or protocol-relative URL.
+		if ( ! preg_match( '%^(?:https?:)?//[^/]+%', $url ) ) {
+			return '';
+		}
+
+		return esc_url_raw( $url, array( 'http', 'https' ) );
+	}
+
+	/**
+	 * Utility method to limit image source URLs.
+	 *
+	 * Excluded URLs include share-this type buttons, loaders, spinners, spacers, WordPress interface images,
+	 * tiny buttons or thumbs, mathtag.com or quantserve.com images, or the WordPress.com stats gif.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $src Image source URL.
+	 * @return string If not matched an excluded URL type, the original URL, empty string otherwise.
+	 */
+	private function _limit_img( $src ) {
+		$src = $this->_limit_url( $src );
+
+		if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
+			// Ads
+			return '';
+		} else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
+			// Share-this type button
+			return '';
+		} else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
+			// Loaders, spinners, spacers
+			return '';
+		} else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
+			// Fancy loaders, spinners, spacers
+			return '';
+		} else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
+			// Thumbnails, too small, usually irrelevant to context
+			return '';
+		} else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+			// Classic WordPress interface images
+			return '';
+		} else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
+			// Most often tiny buttons/thumbs (< 100px wide)
+			return '';
+		} else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
+			// See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
+			return '';
+		} else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+			// WordPress.com stats gif
+			return '';
+		}
+
+		return $src;
+	}
+
+	/**
+	 * Limit embed source URLs to specific providers.
+	 *
+	 * Not all core oEmbed providers are supported. Supported providers include YouTube, Vimeo,
+	 * Vine, Daily Motion, SoundCloud, and Twitter.
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $src Embed source URL.
+	 * @return string If not from a supported provider, an empty string. Otherwise, a reformatted embed URL.
+	 */
+	private function _limit_embed( $src ) {
+		$src = $this->_limit_url( $src );
+
+		if ( empty( $src ) )
+			return '';
+
+		if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
+			// Embedded Youtube videos (www or mobile)
+			$src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
+		} else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
+			// Embedded Vimeo iframe videos
+			$src = 'https://vimeo.com/' . (int) $src_matches[1];
+		} else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
+			// Embedded Vimeo Flash videos
+			$src = 'https://vimeo.com/' . (int) $src_matches[1];
+		} else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
+			// Embedded Vine videos
+			$src = 'https://vine.co/v/' . $src_matches[1];
+		} else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
+			// Embedded Daily Motion videos
+			$src = 'https://www.dailymotion.com/video/' . $src_matches[2];
+		} else {
+			$oembed = _wp_oembed_get_object();
+
+			if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+				$src = '';
+			}
+		}
+
+		return $src;
+	}
+
+	/**
+	 * Set a meta value or convert to array if multiple values
+	 *
+	 *
+	 * @param string $meta_name   Meta key name.
+	 * @param mixed  $meta_value  Meta value.
+	 * @param boolean $single Single Value
+	 */
+	private function _set_meta_entry( $meta_name, $meta_value, $single = true ) {
+		// If the key does not exist set it.
+		if ( ! isset( $this->meta[$meta_name] ) ) {
+			$this->meta[$meta_name] = $meta_value;
+			return;
+		}
+		if ( $single ) {
+			return;
+		}
+		// If it exists but is not an array turn it into one.
+		if ( ! is_array( $this->meta[$meta_name] ) ) {
+			$this->meta[$meta_name] = array( $this->meta[$meta_name] );
+		}
+		// Do not allow duplicates.
+		if ( ! in_array( $meta_value, $this->meta[$meta_name] ) ) {
+			if ( ! is_array( $meta_value ) ) {
+				$this->meta[$meta_name][] = $meta_value;
+			}
+			else {
+				$this->meta[$meta_name] = array_unique( array_merge( $this->meta[$meta_name], $meta_value ) );
+			}
+		}
+	}
+
+
+	/**
+	 * Process recognized meta data entries from the source and store it in a simplified manner
+	 *
+	 * @ignore
+	 * @since 4.2.0
+	 *
+	 * @param string $meta_name  Meta key name.
+	 * @param mixed  $meta_value Meta value.
+	 */
+	private function _process_meta_entry( $meta_name, $meta_value ) {
+		switch ( $meta_name ) {
+			// og:url is the canonical URL so it should be set appropriately
+			case 'og:url':
+				$this->meta['url'] = $meta_value;
+				break;
+			// The type of OGP object
+			case 'og:type':
+				$this->meta['type'] = $meta_value;
+				break;
+			// The Title
+			case 'og:title':
+			case 'twitter:title':
+				$this->_set_meta_entry( 'title', $meta_value );
+				break;
+			case 'og:description':
+			case 'twitter:description':
+			case 'description':
+				$this->_set_meta_entry( 'description', $meta_value );
+				break;
+			case 'article:published_time':
+			case 'article:published':
+			case 'og:article:published':
+			case 'og:article:published_time':
+				$this->_set_meta_entry( 'published', $meta_value );
+				break;
+			case 'article:modified_time':
+			case 'article:modified':
+			case 'og:article:modified':
+			case 'og:article:modified_time':
+				$this->_set_meta_entry( 'modified', $meta_value );
+				break;
+			case 'article:expiration_time':
+				$this->_set_meta_entry( 'expiration', $meta_value );
+				break;
+			case 'og:author':
+			case 'book:author':
+			case 'article:author':
+			case 'good_reads:author':
+				$this->_set_meta_entry( 'author', $meta_value, false );
+				break;
+
+			// The locale it is marked up in
+			case 'og:locale':
+				$this->_set_meta_entry( 'locale', $meta_value );
+				break;
+			// Alternate Locales
+			case 'og:locale:alternate':
+				$this->_set_meta_entry( 'locale:alternate', $meta_value, false );
+				break;
+			case 'og:site_name':
+				$this->_set_meta_entry( 'site_name', $meta_value );
+				break;
+			case 'music:duration':
+			case 'video:duration':
+				$this->_set_meta_entry( 'duration', $meta_value );
+				break;
+			case 'music:album:disc':
+				$this->_set_meta_entry( 'disc', $meta_value );
+				break;
+			case 'place:location:latitude':
+				$this->_set_meta_entry( 'latitude', $meta_value );
+				break;
+			case 'place:location:longitude':
+				$this->_set_meta_entry( 'longitude', $meta_value );
+				break;
+			case 'business:contact_data:street_address':
+				$this->_set_meta_entry( 'street_address', $meta_value );
+				break;
+			case 'business:contact_data:locality':
+				$this->_set_meta_entry( 'locality', $meta_value );
+				break;
+			case 'business:contact_data:postal_code':
+				$this->_set_meta_entry( 'postal_code', $meta_value );
+				break;
+			case 'business:contact_data:country_name':
+				$this->_set_meta_entry( 'country_name', $meta_value );
+				break;
+			case 'music:album:track':
+				$this->_set_meta_entry( 'track', $meta_value );
+				break;
+			case 'video:series':
+				$this->_set_meta_entry( 'series', $meta_value );
+				break;
+			case 'book:release_date':
+			case 'music:release_date': 
+				$this->_set_meta_entry( 'release_date', $meta_value );
+				break;
+			case 'og:video':
+			case 'og:video:secure_url':
+			case 'og:audio':
+				$meta_value = $this->_limit_embed( $meta_value );
+				if ( ! isset( $this->embeds ) ) {
+					$this->embeds = array();
+				}
+
+				if ( ! empty( $meta_value ) && ! in_array( $meta_value, $this->embeds ) ) {
+					$this->embeds[] = $meta_value;
+				}
+
+				return;
+
+			case 'article:section':
+				$this->_set_meta_entry( 'section', $meta_value, false );
+				break;
+			case 'book:isbn':
+			case 'good_reads:isbn':
+				$this->_set_meta_entry( 'isbn', $meta_value );
+				break;
+			case 'og:image':
+			case 'og:image:secure_url':
+			case 'twitter:image0:src':
+			case 'twitter:image0':
+			case 'twitter:image:src':
+			case 'twitter:image':
+				$meta_value = $this->_limit_img( $meta_value );
+				if ( ! isset( $this->images ) ) {
+					$this->images = array();
+				}
+
+				if ( ! empty( $meta_value ) && ! in_array( $meta_value, $this->images ) ) {
+					$this->images[] = $meta_value;
+				}
+				break;
+			case 'keywords':
+			case 'news_keywords':
+			case 'video:tag':
+			case 'article:tag':
+			case 'book:tag':
+				if ( 1 < substr_count( $meta_value, ',' ) ) {
+					$this->_set_meta_entry( 'tag', explode( ',', $meta_value ), false );
+				}
+				else {
+					$this->_set_meta_entry( 'tag', $meta_value, false );
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Parses _meta, _images, and _links data from the content.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 *
+	 */
+	public function source_data_parse( ) {
+		if ( empty( $this->content ) ) {
+			return false;
+		}
+
+		// Strip the content to only the elements being looked at
+		$allowed_elements = array(
+			'img' => array(
+			'src'      => true,
+			'width'    => true,
+			'height'   => true,
+			),
+			'iframe' => array(
+				'src'      => true,
+			),
+			'link' => array(
+				'rel'      => true,
+				'itemprop' => true,
+				'href'     => true,
+			),
+			'meta' => array(
+				'property' => true,
+				'name'     => true,
+				'content'  => true,
+			)
+		);
+		$source_content = wp_kses( $this->content, $allowed_elements );
+
+		// Fetch and gather <meta> data first, so discovered media is offered 1st to user.
+		if ( empty( $this->meta ) ) {
+			$this->meta = array();
+		}
+		if ( preg_match_all( '/<meta [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+			// For Debugging Purposes Generate an Entire Unfiltered Array
+			$unfiltered = array();
+			foreach ( $items as $value ) {
+				if ( preg_match( '/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches ) ) {
+					$meta_name  = $this->_limit_string( $new_matches[2] );
+					$meta_value = $this->_limit_string( $new_matches[3] );
+
+					// Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
+					if ( strlen( $meta_name ) > 200 ) {
+						continue;
+					}
+					$unfiltered[ $meta_name ] = $meta_value;
+					$this->_process_meta_entry( $meta_name, $meta_value );
+				}
+			}
+			$this->_set_meta_entry( 'unfiltered', $unfiltered );
+		}
+
+		// Fetch and gather <img> data.
+		if ( empty( $this->images ) ) {
+			$this->images = array();
+		}
+
+		if ( preg_match_all( '/<img [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( ( preg_match( '/width=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 256 ) ||
+					( preg_match( '/height=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 128 ) ) {
+
+					continue;
+				}
+
+				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches ) ) {
+					$src = $this->_limit_img( $new_matches[2] );
+					if ( ! empty( $src ) && ! in_array( $src, $this->images ) ) {
+						$this->images[] = $src;
+					}
+				}
+			}
+		}
+
+		// Fetch and gather <iframe> data.
+		if ( empty( $this->embeds ) ) {
+			$this->embeds = array();
+		}
+
+		if ( preg_match_all( '/<iframe [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/', $value, $new_matches ) ) {
+					$src = $this->_limit_embed( $new_matches[2] );
+
+					if ( ! empty( $src ) && ! in_array( $src, $this->embeds ) ) {
+						$this->embeds[] = $src;
+					}
+				}
+			}
+		}
+
+		// Fetch and gather <link> data.
+		if ( empty( $this->links ) ) {
+			$this->links = array();
+		}
+
+		if ( preg_match_all( '/<link [^>]+>/', $source_content, $matches ) ) {
+			$items = $this->_limit_array( $matches[0] );
+
+			foreach ( $items as $value ) {
+				if ( preg_match( '/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel ) && preg_match( '/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url ) ) {
+					$rel = $matches_rel[1];
+					$url = $this->_limit_url( $matches_url[1] );
+
+					if ( ! empty( $url ) && empty( $this->links[ $rel ] ) ) {
+						$this->links[ $rel ] = $url;
+					}
+				}
+			}
+		}
+
+		// If Title is Not Set Use Title Tag
+		if ( ! isset( $this->meta['title'] ) ) {
+			preg_match( '/<title>(.+)<\/title>/i', $this->content, $match );
+			$this->meta['title'] = trim( $match[1] );
+		}
+		// If Site Name is not set use domain name less www
+		if ( ! isset( $this->meta['site_name'] ) ) {
+			$this->meta['site_name'] = preg_replace( '/^www\./', '', $this->domain );
+		}
+
+		$allowed_elements = array(
+			'a' => array(
+				'href' => true
+			)
+		);
+		// Only hunt for links that are actual links
+		$source_content = wp_kses( $this->content, $allowed_elements );
+		$this->urls = wp_extract_urls( $source_content );
+
+
+	}
+
+        /**
+         * Verifies whether the provided URL is in the content..
+         *
+         * @since x.x.x
+         * @access public
+         *
+         * @param string $url URL.
+         */
+	public function verify_url_in_content( $url ) {
+		return in_array( $url, $this->urls );
+	}
+
+	public function get_meta( $key = null ) {
+		if ( ! $key ) {
+			return $this->meta;
+		}
+		else { 
+			if ( isset( $this->meta[ $key ] ) ) {
+				return $this->meta[ $key ];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Maps the return from Parse This to Microformat Properties
+	 *
+	 * @param string $content HTML marked up content
+	 */
+	public function meta_to_microformats() {
+		$data = array();
+		$data['name'] = $this->get_meta( 'title' ); // ifset( $meta['og:music:song'] );
+		$data['summary'] = $this->get_meta( 'description' );
+		// $data['site'] = ifset( $meta['og:site'] ) ?: ifset( $meta['twitter:site'] );
+		$data['author'] = $this->get_meta( 'author' );
+		
+		// $data['featured'] = ifset( $meta['og:image'] ) ?: ifset( $meta['twitter:image'] );
+		$data['publication'] =  $this->get_meta( 'site_name' ); // ifset( $meta['og:site_name'] ) ?: ifset( $meta['og:music:album'] );
+		$data['published'] = $this->get_meta( 'published' ) ?: $this->get_meta( 'release_date' );
+		$data['updated'] = $this->get_meta( 'modified' );
+		$data['category'] = array_values( $this->get_meta( 'tag' ) );
+		// Extended Parameters
+		// $data['audio'] = ifset( $meta['og:audio'] );
+		// $data['video'] = ifset( $meta['og:video'] );
+		$data['duration'] = $this->get_meta( 'duration' );
+		$type = $this->get_meta( 'type' );
+		$data['photo'] = $this->images;
+		$data['media'] = $this->embeds;
+		$data['raw'] = $this->get_meta();
+		// $data['icon'] = ifset( $meta['msapplication-TileImage'] );
+                // $data['icon'] = ifset( $meta['msapplication-TileImage'] );
+		return array_filter( $data );
+	}
+
+	public function get_all() {
+	       return array(
+	       	       'images' => array_filter( $this->images ),
+		       'embeds' => array_filter( $this->embeds ),
+		       'meta' => array_filter( $this->meta ),
+		       'links' => array_filter( $this->links ),
+		       'urls' => array_filter( $this->urls ),
+		       'content' => $this->content
+	       );
+	}
+
+}
diff --git a/includes/kind-functions.php b/includes/kind-functions.php
index bc335a8..aa0787f 100755
--- a/includes/kind-functions.php
+++ b/includes/kind-functions.php
@@ -95,4 +95,20 @@ function set_post_kind( $post, $kind ) {
 	return Kind_Taxonomy::set_post_kind( $post, $kind );
 }
 
+/**
+ * Return the Displayed Response for a Specific Kind
+ * @param $slug
+ * @param $name
+ * @return string
+ */
+
+function get_kind_view_part($slug, $name = null) {
+	Kind_View::get_view_part( $slug, $name );
+}
+
+function kind_response_display() {
+        echo apply_filters( 'kind_response_display', '' );
+}
+
+
 ?>
diff --git a/includes/kind-sprite.svg b/includes/kind-sprite.svg
index d3eb32c..e430c97 100644
--- a/includes/kind-sprite.svg
+++ b/includes/kind-sprite.svg
@@ -1,6 +1,6 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><symbol viewBox="0 0 16 16" id="article"><title>article</title> <path d="M11,2H5C3.9,2,3,2.9,3,4v8c0,1.1,0.9,2,2,2h5l3-3V4C13,2.9,12.1,2,11,2z M11,9h-1c-1.1,0-2,0.9-2,2v1H5V4h6V9z"/> <rect x="6" y="5" width="4" height="1"/> <rect x="6" y="7" width="2" height="1"/> </symbol><symbol viewBox="0 0 1792 1792" id="bookmark"><title>bookmark</title><path d="M1420 128q23 0 44 9 33 13 52.5 41t19.5 62v1289q0 34-19.5 62t-52.5 41q-19 8-44 8-48 0-83-32l-441-424-441 424q-36 33-83 33-23 0-44-9-33-13-52.5-41t-19.5-62v-1289q0-34 19.5-62t52.5-41q21-9 44-9h1048z"/></symbol><symbol viewBox="0 0 16 16" id="checkin"><title>checkin</title> <path d="M11.5,3.5c-2-2-5.1-2-7.1,0c-2,2-2,5.1,0,7.1L8,14.1l3.5-3.5C13.5,8.6,13.5,5.4,11.5,3.5z M9.4,8.4c-0.8,0.8-2,0.8-2.8,0
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><symbol viewBox="0 0 16 16" id="article"><title>article</title> <path d="M11,2H5C3.9,2,3,2.9,3,4v8c0,1.1,0.9,2,2,2h5l3-3V4C13,2.9,12.1,2,11,2z M11,9h-1c-1.1,0-2,0.9-2,2v1H5V4h6V9z"/> <rect x="6" y="5" width="4" height="1"/> <rect x="6" y="7" width="2" height="1"/> </symbol><symbol viewBox="0 0 1792 1792" id="bookmark"><title>bookmark</title> <path d="M1420 128q23 0 44 9 33 13 52.5 41t19.5 62v1289q0 34-19.5 62t-52.5 41q-19 8-44 8-48 0-83-32l-441-424-441 424q-36 33-83 33-23 0-44-9-33-13-52.5-41t-19.5-62v-1289q0-34 19.5-62t52.5-41q21-9 44-9h1048z"/></symbol><symbol viewBox="0 0 16 16" id="checkin"><title>checkin</title> <path d="M11.5,3.5c-2-2-5.1-2-7.1,0c-2,2-2,5.1,0,7.1L8,14.1l3.5-3.5C13.5,8.6,13.5,5.4,11.5,3.5z M9.4,8.4c-0.8,0.8-2,0.8-2.8,0
 	c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0C10.2,6.4,10.2,7.6,9.4,8.4z"/> </symbol><symbol viewBox="0 0 1792 1792" id="drink"><title>drink</title><path d="M1600 640q0-80-56-136t-136-56h-64v384h64q80 0 136-56t56-136zm-1664 768h1792q0 106-75 181t-181 75h-1280q-106 0-181-75t-75-181zm1856-768q0 159-112.5 271.5t-271.5 112.5h-64v32q0 92-66 158t-158 66h-704q-92 0-158-66t-66-158v-736q0-26 19-45t45-19h1152q159 0 271.5 112.5t112.5 271.5z"/></symbol><symbol viewBox="0 0 16 16" id="exercise"><title>exercise</title> <style type="text/css"> .st0{fill:#231F20;} </style> <path class="st0" d="M10,11.8L8.5,7.7l-1.6,3.7c-0.3,0.8-1.4,0.8-1.8,0.1L3.9,9l-1.1,1.6L1.2,9.4l2-3c0.4-0.6,1.4-0.6,1.7,0.1l1,2.1
-	l1.7-4c0.3-0.8,1.5-0.8,1.8,0l1.6,4l2.1-5.9l1.8,0.6l-3,8.5C11.6,12.7,10.4,12.7,10,11.8z"/> </symbol><symbol viewBox="0 0 16 16" id="favorite"><title>favorite</title> <polygon points="8,1.3 10,5.9 15,6.4 11.3,9.8 12.3,14.7 8,12.2 3.7,14.7 4.7,9.8 1,6.4 6,5.9 "/> </symbol><symbol viewBox="0 0 1792 1792" id="food"><title>food</title><path d="M832 64v640q0 61-35.5 111t-92.5 70v779q0 52-38 90t-90 38h-128q-52 0-90-38t-38-90v-779q-57-20-92.5-70t-35.5-111v-640q0-26 19-45t45-19 45 19 19 45v416q0 26 19 45t45 19 45-19 19-45v-416q0-26 19-45t45-19 45 19 19 45v416q0 26 19 45t45 19 45-19 19-45v-416q0-26 19-45t45-19 45 19 19 45zm768 0v1600q0 52-38 90t-90 38h-128q-52 0-90-38t-38-90v-512h-224q-13 0-22.5-9.5t-9.5-22.5v-800q0-132 94-226t226-94h256q26 0 45 19t19 45z"/></symbol><symbol viewBox="0 0 1792 1792" id="itinerary"><title>itinerary</title><path d="M640 384h512v-128h-512v128zm-352 0v1280h-64q-92 0-158-66t-66-158v-832q0-92 66-158t158-66h64zm1120 0v1280h-1024v-1280h128v-160q0-40 28-68t68-28h576q40 0 68 28t28 68v160h128zm384 224v832q0 92-66 158t-158 66h-64v-1280h64q92 0 158 66t66 158z"/></symbol><symbol viewBox="0 0 1792 1792" id="jam"><title>jam</title><path d="M1664 224v1120q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-537l-768 237v709q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-967q0-31 19-56.5t49-35.5l832-256q12-4 28-4 40 0 68 28t28 68z"/></symbol><symbol viewBox="0 0 16 16" id="like"><title>like</title> <path d="M8,13L2.9,8.2C1.8,7.1,1.7,5.2,2.7,4c1-1.2,2.8-1.3,4-0.2L8,5l1.3-1.2c1.2-1.1,3-1,4,0.2c1.1,1.2,1,3.1-0.2,4.2L8,13z"/> </symbol><symbol viewBox="0 0 1792 1792" id="listen"><title>listen</title><path d="M1728 886q0 166-60 314l-20 49-185 33q-22 83-90.5 136.5t-156.5 53.5v32q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-576q0-14 9-23t23-9h64q14 0 23 9t9 23v32q71 0 130 35.5t93 95.5l68-12q29-95 29-193 0-148-88-279t-236.5-209-315.5-78-315.5 78-236.5 209-88 279q0 98 29 193l68 12q34-60 93-95.5t130-35.5v-32q0-14 9-23t23-9h64q14 0 23 9t9 23v576q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-32q-88 0-156.5-53.5t-90.5-136.5l-185-33-20-49q-60-148-60-314 0-151 67-291t179-242.5 266-163.5 320-61 320 61 266 163.5 179 242.5 67 291z"/></symbol><symbol viewBox="0 0 16 16" id="mood"><title>moodkind/mood.svg at master &#xB7; acegiak/moodkind &#xB7; GitHub</title><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></symbol><symbol viewBox="0 0 16 16" id="note"><title>note</title> <path d="M11,3H5C3.9,3,3,3.9,3,5v6c0,1.1,0.9,2,2,2h5l3-3V5C13,3.9,12.1,3,11,3z M11,8h-1c-1.1,0-2,0.9-2,2v1H5V5h6V8z"/> </symbol><symbol viewBox="0 0 16 16" id="photo"><title>photo</title> <path d="M13,5h-2l-1-2H6L5,5H3C2.4,5,2,5.4,2,6v6c0,0.5,0.4,1,1,1h10c0.5,0,1-0.4,1-1V6C14,5.4,13.6,5,13,5z M8,12c-1.7,0-3-1.3-3-3
+	l1.7-4c0.3-0.8,1.5-0.8,1.8,0l1.6,4l2.1-5.9l1.8,0.6l-3,8.5C11.6,12.7,10.4,12.7,10,11.8z"/> </symbol><symbol viewBox="0 0 16 16" id="favorite"><title>favorite</title> <polygon points="8,1.3 10,5.9 15,6.4 11.3,9.8 12.3,14.7 8,12.2 3.7,14.7 4.7,9.8 1,6.4 6,5.9 "/> </symbol><symbol viewBox="0 0 1792 1792" id="food"><title>food</title><path d="M832 64v640q0 61-35.5 111t-92.5 70v779q0 52-38 90t-90 38h-128q-52 0-90-38t-38-90v-779q-57-20-92.5-70t-35.5-111v-640q0-26 19-45t45-19 45 19 19 45v416q0 26 19 45t45 19 45-19 19-45v-416q0-26 19-45t45-19 45 19 19 45v416q0 26 19 45t45 19 45-19 19-45v-416q0-26 19-45t45-19 45 19 19 45zm768 0v1600q0 52-38 90t-90 38h-128q-52 0-90-38t-38-90v-512h-224q-13 0-22.5-9.5t-9.5-22.5v-800q0-132 94-226t226-94h256q26 0 45 19t19 45z"/></symbol><symbol viewBox="0 0 1792 1792" id="itinerary"><title>itinerary</title><path d="M640 384h512v-128h-512v128zm-352 0v1280h-64q-92 0-158-66t-66-158v-832q0-92 66-158t158-66h64zm1120 0v1280h-1024v-1280h128v-160q0-40 28-68t68-28h576q40 0 68 28t28 68v160h128zm384 224v832q0 92-66 158t-158 66h-64v-1280h64q92 0 158 66t66 158z"/></symbol><symbol viewBox="0 0 1792 1792" id="jam"><title>jam</title><path d="M1664 224v1120q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-537l-768 237v709q0 50-34 89t-86 60.5-103.5 32-96.5 10.5-96.5-10.5-103.5-32-86-60.5-34-89 34-89 86-60.5 103.5-32 96.5-10.5q105 0 192 39v-967q0-31 19-56.5t49-35.5l832-256q12-4 28-4 40 0 68 28t28 68z"/></symbol><symbol viewBox="0 0 16 16" id="like"><title>like</title> <path d="M8,13L2.9,8.2C1.8,7.1,1.7,5.2,2.7,4c1-1.2,2.8-1.3,4-0.2L8,5l1.3-1.2c1.2-1.1,3-1,4,0.2c1.1,1.2,1,3.1-0.2,4.2L8,13z"/> </symbol><symbol viewBox="0 0 1792 1792" id="listen"><title>listen</title><path d="M1728 886q0 166-60 314l-20 49-185 33q-22 83-90.5 136.5t-156.5 53.5v32q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-576q0-14 9-23t23-9h64q14 0 23 9t9 23v32q71 0 130 35.5t93 95.5l68-12q29-95 29-193 0-148-88-279t-236.5-209-315.5-78-315.5 78-236.5 209-88 279q0 98 29 193l68 12q34-60 93-95.5t130-35.5v-32q0-14 9-23t23-9h64q14 0 23 9t9 23v576q0 14-9 23t-23 9h-64q-14 0-23-9t-9-23v-32q-88 0-156.5-53.5t-90.5-136.5l-185-33-20-49q-60-148-60-314 0-151 67-291t179-242.5 266-163.5 320-61 320 61 266 163.5 179 242.5 67 291z"/></symbol><symbol viewBox="0 0 24 24" id="mood"><title>mood</title> <path d="M 11.60448,2.4538269 C 10.759228,2.6291641 10.184968,3.0505958 9.8099323,3.4459747 9.4348963,3.8413536 9.1780054,4.2222913 8.8258253,4.5243963 8.3554475,4.9278928 7.8057172,5.2298672 7.2628318,5.6243863 6.7199464,6.0189054 6.2077578,6.5262279 5.9603372,7.2420187 5.7414856,7.8751588 5.9488504,8.4415059 6.2208361,8.8812195 c 0.2719857,0.4397136 0.5775404,0.8079367 0.7525525,1.1862635 0.2337489,0.5053 0.3049917,1.005324 0.4920535,1.552927 0.1870617,0.547603 0.5074902,1.143204 1.2156616,1.66077 0.6264004,0.457802 1.4080253,0.602718 2.0550473,0.647052 0.647021,0.04434 1.209467,0.03162 1.736659,0.107843 0.704127,0.101803 1.3251,0.299853 2.055047,0.452937 0.729947,0.153084 1.591509,0.241363 2.547101,0.04314 0.845252,-0.175338 1.419512,-0.59677 1.794548,-0.992148 0.375036,-0.395379 0.631927,-0.776317 0.984107,-1.078422 0.470378,-0.403496 1.020108,-0.705471 1.562993,-1.09999 C 21.959491,10.96707 22.47168,10.459747 22.719101,9.7439567 22.937952,9.1108166 22.730588,8.5444695 22.458602,8.104756 22.186616,7.6650424 21.881061,7.2968192 21.706049,6.9184922 21.472301,6.4131923 21.401058,5.9131681 21.213996,5.3655651 21.026934,4.8179622 20.706506,4.2223607 19.998334,3.7047959 19.371934,3.2469931 18.590309,3.1020777 17.943287,3.057743 17.296266,3.0134083 16.73382,3.0261228 16.206628,2.9499008 15.502501,2.8480975 14.881528,2.6500476 14.151581,2.4969637 13.421634,2.3438799 12.560072,2.2556009 11.60448,2.4538269 z"/> <path d="m 11.66545,15.517255 c -0.316994,-0.06175 -0.601266,-0.02433 -0.837785,0.03847 -0.236519,0.0628 -0.431149,0.138381 -0.638312,0.192334 -0.152906,0.03982 -0.3186888,0.06222 -0.5266071,0.1154 -0.2079183,0.05318 -0.4598073,0.164451 -0.6542697,0.376974 -0.179355,0.196012 -0.260855,0.40124 -0.3271349,0.60008 -0.012787,0.03836 -0.053828,0.07838 -0.063831,0.1154 -0.061854,0.228901 -0.088498,0.43089 -0.1436202,0.630854 -0.040686,0.147593 -0.1113664,0.299856 -0.1675568,0.500067 -0.05619,0.20021 -0.077693,0.462223 0.015958,0.730867 0.1030381,0.295573 0.2801322,0.518606 0.4547972,0.684707 0.174665,0.1661 0.3426513,0.292509 0.4946917,0.43852 0.112221,0.10777 0.2073227,0.237641 0.3590505,0.384667 0.1517278,0.147026 0.3821143,0.305466 0.6702273,0.361587 0.316994,0.06175 0.601265,0.02433 0.837784,-0.03847 0.236519,-0.0628 0.431149,-0.146074 0.638312,-0.200027 0.152907,-0.03982 0.318689,-0.05452 0.526607,-0.107706 0.207919,-0.05318 0.459808,-0.164451 0.65427,-0.376974 0.213956,-0.233826 0.329112,-0.494273 0.390966,-0.723174 0.06185,-0.228901 0.0885,-0.423196 0.14362,-0.62316 0.04069,-0.147593 0.111367,-0.299857 0.167557,-0.500067 0.05619,-0.20021 0.07769,-0.469917 -0.01596,-0.73856 -0.103039,-0.295573 -0.280133,-0.510914 -0.454798,-0.677014 -0.151222,-0.143807 -0.29593,-0.255218 -0.43086,-0.376974 l -0.06383,-0.06155 C 12.582507,16.155738 12.487405,16.025868 12.335677,15.878842 12.183949,15.731816 11.953562,15.573376 11.66545,15.517255 z"/> <path d="m 5.6312267,19.238975 c -0.1033199,0.0057 -0.2020645,0.01845 -0.28422,0.03656 -0.164311,0.03621 -0.2812474,0.07974 -0.4009532,0.105616 -0.082497,0.01783 -0.1908991,0.0252 -0.3400489,0.05687 -0.1491498,0.03167 -0.3447377,0.105795 -0.4923097,0.239668 -0.1057417,0.09593 -0.1693515,0.197237 -0.2182403,0.296538 -0.022827,0.04637 -0.052302,0.09204 -0.06598,0.134051 -0.04297,0.131998 -0.059505,0.237185 -0.091356,0.333098 -0.021951,0.0661 -0.061199,0.144824 -0.1015071,0.26404 -0.040308,0.119217 -0.065993,0.293862 0.00508,0.463087 0.074701,0.177874 0.2085575,0.314495 0.3298982,0.410278 0.1213407,0.09578 0.226818,0.157448 0.3146722,0.227482 0.060546,0.04826 0.1246248,0.119623 0.2334664,0.20717 0.1088417,0.08755 0.2838199,0.188067 0.5024604,0.223419 0.2298156,0.03716 0.4498072,0.0159 0.6141182,-0.02031 0.164311,-0.03621 0.2812475,-0.07974 0.4009532,-0.105616 0.082497,-0.01784 0.1908992,-0.0252 0.3400489,-0.05687 0.1491498,-0.03167 0.3447378,-0.105795 0.4923097,-0.239668 0.1551146,-0.140715 0.2412497,-0.302654 0.28422,-0.434652 0.04297,-0.131997 0.05443,-0.233123 0.086281,-0.329035 0.021951,-0.0661 0.066274,-0.144824 0.1065825,-0.26404 0.040308,-0.119217 0.060918,-0.293863 -0.010151,-0.463087 C 7.2618458,20.145699 7.1330646,20.009078 7.0117239,19.913294 6.8903832,19.817511 6.7849059,19.755847 6.6970517,19.685813 6.6365059,19.637549 6.572427,19.56619 6.4635853,19.478643 6.3547437,19.391095 6.1797654,19.290576 5.961125,19.255224 5.8462172,19.236645 5.7345467,19.233298 5.6312267,19.238975 z"/> </symbol><symbol viewBox="0 0 16 16" id="note"><title>note</title> <path d="M11,3H5C3.9,3,3,3.9,3,5v6c0,1.1,0.9,2,2,2h5l3-3V5C13,3.9,12.1,3,11,3z M11,8h-1c-1.1,0-2,0.9-2,2v1H5V5h6V8z"/> </symbol><symbol viewBox="0 0 16 16" id="photo"><title>photo</title> <path d="M13,5h-2l-1-2H6L5,5H3C2.4,5,2,5.4,2,6v6c0,0.5,0.4,1,1,1h10c0.5,0,1-0.4,1-1V6C14,5.4,13.6,5,13,5z M8,12c-1.7,0-3-1.3-3-3
 	s1.3-3,3-3s3,1.3,3,3S9.7,12,8,12z M8,7C6.9,7,6,7.9,6,9s0.9,2,2,2s2-0.9,2-2S9.1,7,8,7z"/> </symbol><symbol viewBox="0 0 1792 1792" id="play"><title>play</title><path d="M768 1088v-128q0-14-9-23t-23-9h-192v-192q0-14-9-23t-23-9h-128q-14 0-23 9t-9 23v192h-192q-14 0-23 9t-9 23v128q0 14 9 23t23 9h192v192q0 14 9 23t23 9h128q14 0 23-9t9-23v-192h192q14 0 23-9t9-23zm576 64q0-53-37.5-90.5t-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5 90.5-37.5 37.5-90.5zm256-256q0-53-37.5-90.5t-90.5-37.5-90.5 37.5-37.5 90.5 37.5 90.5 90.5 37.5 90.5-37.5 37.5-90.5zm256 128q0 212-150 362t-362 150q-192 0-338-128h-220q-146 128-338 128-212 0-362-150t-150-362 150-362 362-150h896q212 0 362 150t150 362z"/></symbol><symbol viewBox="0 0 16 16" id="quote"><title>quote</title> <path d="M2,9h3c0,1.1-0.9,2-2,2v2c2.2,0,4-1.8,4-4V4H2V9z M9,4v5h3c0,1.1-0.9,2-2,2v2c2.2,0,4-1.8,4-4V4H9z"/> </symbol><symbol viewBox="0 0 16 16" id="read"><title>read</title> <path d="M11,2H7v7L6,8L5,9V2H3v12h8c1.1,0,2-0.9,2-2V4C13,2.9,12.1,2,11,2z"/> </symbol><symbol viewBox="0 0 1792 1792" id="recipe"><title>recipe</title><path d="M384 1184v64q0 13-9.5 22.5t-22.5 9.5h-64q-13 0-22.5-9.5t-9.5-22.5v-64q0-13 9.5-22.5t22.5-9.5h64q13 0 22.5 9.5t9.5 22.5zm0-256v64q0 13-9.5 22.5t-22.5 9.5h-64q-13 0-22.5-9.5t-9.5-22.5v-64q0-13 9.5-22.5t22.5-9.5h64q13 0 22.5 9.5t9.5 22.5zm0-256v64q0 13-9.5 22.5t-22.5 9.5h-64q-13 0-22.5-9.5t-9.5-22.5v-64q0-13 9.5-22.5t22.5-9.5h64q13 0 22.5 9.5t9.5 22.5zm1152 512v64q0 13-9.5 22.5t-22.5 9.5h-960q-13 0-22.5-9.5t-9.5-22.5v-64q0-13 9.5-22.5t22.5-9.5h960q13 0 22.5 9.5t9.5 22.5zm0-256v64q0 13-9.5 22.5t-22.5 9.5h-960q-13 0-22.5-9.5t-9.5-22.5v-64q0-13 9.5-22.5t22.5-9.5h960q13 0 22.5 9.5t9.5 22.5zm0-256v64q0 13-9.5 22.5t-22.5 9.5h-960q-13 0-22.5-9.5t-9.5-22.5v-64q0-13 9.5-22.5t22.5-9.5h960q13 0 22.5 9.5t9.5 22.5zm128 704v-832q0-13-9.5-22.5t-22.5-9.5h-1472q-13 0-22.5 9.5t-9.5 22.5v832q0 13 9.5 22.5t22.5 9.5h1472q13 0 22.5-9.5t9.5-22.5zm128-1088v1088q0 66-47 113t-113 47h-1472q-66 0-113-47t-47-113v-1088q0-66 47-113t113-47h1472q66 0 113 47t47 113z"/></symbol><symbol viewBox="0 0 16 16" id="reply"><title>reply</title>  <g> <path d="M12,4H4C2.9,4,2,4.9,2,6v8l2.4-2.4C4.8,11.2,5.3,11,5.8,11H12c1.1,0,2-0.9,2-2V6C14,4.9,13.1,4,12,4z"/> </g> </symbol><symbol viewBox="0 0 16 16" id="repost"><title>repost</title> <path d="M12,6h-2v2h2v4H4V8h2V6H4C2.9,6,2,6.9,2,8v4c0,1.1,0.9,2,2,2h8c1.1,0,2-0.9,2-2V8C14,6.9,13.1,6,12,6z M7,4.4V10h2V4.4
 	l1.1,1.1l1.4-1.4L8,0.6L4.5,4.1l1.4,1.4L7,4.4z"/> </symbol><symbol viewBox="0 0 1792 1792" id="rsvp"><title>rsvp</title><path d="M1303 964l-512 512q-10 9-23 9t-23-9l-288-288q-9-10-9-23t9-22l46-46q9-9 22-9t23 9l220 220 444-444q10-9 23-9t22 9l46 46q9 9 9 22t-9 23zm-1175 700h1408v-1024h-1408v1024zm384-1216v-288q0-14-9-23t-23-9h-64q-14 0-23 9t-9 23v288q0 14 9 23t23 9h64q14 0 23-9t9-23zm768 0v-288q0-14-9-23t-23-9h-64q-14 0-23 9t-9 23v288q0 14 9 23t23 9h64q14 0 23-9t9-23zm384-64v1280q0 52-38 90t-90 38h-1408q-52 0-90-38t-38-90v-1280q0-52 38-90t90-38h128v-96q0-66 47-113t113-47h64q66 0 113 47t47 113v96h384v-96q0-66 47-113t113-47h64q66 0 113 47t47 113v96h128q52 0 90 38t38 90z"/></symbol><symbol viewBox="0 0 16 16" id="tag"><title>tag</title> <path d="M11.3,4.3C11.1,4.1,10.9,4,10.6,4H3C2.5,4,2,4.5,2,5v6c0,0.6,0.5,1,1,1h7.6c0.3,0,0.5-0.1,0.7-0.3L15,8L11.3,4.3z M10,9
 	C9.5,9,9,8.5,9,8s0.5-1,1-1s1,0.5,1,1S10.5,9,10,9z"/> </symbol><symbol viewBox="0 0 1792 1792" id="trip"><title>trip</title><path d="M640 384h512v-128h-512v128zm-352 0v1280h-64q-92 0-158-66t-66-158v-832q0-92 66-158t158-66h64zm1120 0v1280h-1024v-1280h128v-160q0-40 28-68t68-28h576q40 0 68 28t28 68v160h128zm384 224v832q0 92-66 158t-158 66h-64v-1280h64q92 0 158 66t66 158z"/></symbol><symbol viewBox="0 0 16 16" id="watch"><title>watch</title> <path d="M12,4v1h-1V4H5v1H4V4H2v9h2v-1h1v1h6v-1h1v1h2V4H12z M5,11H4v-1h1V11z M5,9H4V8h1V9z M5,7H4V6h1V7z M12,11h-1v-1h1V11z
diff --git a/includes/tabs/retrieve.js b/includes/tabs/retrieve.js
index c0c3d9e..f11053d 100644
--- a/includes/tabs/retrieve.js
+++ b/includes/tabs/retrieve.js
@@ -1,64 +1,66 @@
 jQuery( document ).on( 'click', '.kind-retrieve-button', function($) {
 	jQuery.ajax({ 
-			type: 'POST',
-			url: ajaxurl,
-			data: {
-				action: 'kind_urlfetch',
-				kind_url: jQuery("#cite_url").val()
+			type: 'GET',
+	        	// Here we supply the endpoint url, as opposed to the action in the data object with the admin-ajax method
+			url: rest_object.api_url + 'parse/', 
+			beforeSend: function ( xhr ) {
+			       	// Here we set a header 'X-WP-Nonce' with the nonce as opposed to the nonce in the data object with admin-ajax
+				xhr.setRequestHeader( 'X-WP-Nonce', rest_object.api_nonce );
+			},
+			data: { 
+				kindurl: jQuery("#cite_url").val()
 			},
 		success : function( response ) {
-      if ( typeof response !== 'undefined' ) {
-				if ( typeof response['data'] !== 'undefined' ) {
-					if ( 'name' in response['data'] ) {
-						jQuery("#cite_name").val(response['data']['name']);
-						if ( jQuery('#title').val() === '' ) {
-							jQuery("#title").val(response['data']['name']);
-						}
-					}
- 		     	if ( 'publication' in response['data'] ) {
-   		      jQuery("#cite_publication").val(response['data']['publication']) ;
+			if ( 'name' in response ) {
+				jQuery("#cite_name").val(response['name']);
+				if ( jQuery('#title').val() === '' ) {
+					jQuery("#title").val(response['name']);
+				}
+			}
+ 		     	if ( 'publication' in response ) {
+				jQuery("#cite_publication").val(response['publication']) ;
    	  	 	}
-
-      		if ( 'published' in response['data'] ) {
-						var published = moment.parseZone( response['data']['published'] );
-       	 		jQuery("#start_date").val( published.format('YYYY-MM-DD') ) ;
-						jQuery("#start_time").val(published.format('HH:mm:ss') ) ;
-						jQuery("#start_offset").val(published.format('Z') );
+			if ( 'published' in response ) {
+				var published = moment.parseZone( response['published'] );
+				jQuery("#cite_published_date").val( published.format('YYYY-MM-DD') ) ;
+				jQuery("#cite_published_time").val(published.format('HH:mm:ss') ) ;
+				jQuery("#cite_published_offset").val(published.format('Z') );
  	 	    	}
-   		   	if ( 'updated' in response['data'] ) {
-       		 	var updated = moment.parseZone( response['data']['updated'] );
-        		jQuery("#end_date").val( updated.format('YYYY-MM-DD') ) ;
-        		jQuery("#end_time").val(updated.format('HH:mm:ss') ) ;
-        		jQuery("#end_offset").val(updated.format('Z') );  
-      		}
-
-      		if ( 'summary' in response['data'] ) {
-        		jQuery("#cite_summary").val(response['data']['summary']) ;
-      		}
-      		if ( 'featured' in response['data'] ) {
-        		jQuery("#cite_featured").val(response['data']['featured']) ;
-      		}
-      		if ( 'duration' in response['data'] ) {
-        		jQuery("#duration").val(response['data']['duration']) ;
-      		}
-
-      		if ( 'author' in response['data'] ) {
-	      		if ( 'name' in response['data']['author'] ) {
-  	      		jQuery("#author_name").val(response['data']['author']['name']) ;
-    	  		}
-        		if ( 'photo' in response['data']['author'] ) {
-          		jQuery("#author_photo").val(response['data']['author']['photo']) ;
-        		}
-        		if ( 'url' in response['data']['author'] ) {
-          		jQuery("#author_url").val(response['data']['author']['url']) ;
-        		}
-					}
-				}
+   		   	if ( 'updated' in response ) {
+				var updated = moment.parseZone( response['updated'] );
+        			jQuery("#cite_updated_date").val( updated.format('YYYY-MM-DD') ) ;
+        			jQuery("#cite_updated_time").val(updated.format('HH:mm:ss') ) ;
+        			jQuery("#cite_updated_offset").val(updated.format('Z') );  
+      			}
+			if ( 'summary' in response ) {
+        			jQuery("#cite_summary").val(response['summary']) ;
+      			}
+  	    		if ( 'featured' in response ) {
+  	 	     		jQuery("#cite_featured").val(response['featured']) ;
+      			}
+      			if ( ( 'author' in response ) && ( typeof response['author'] != 'string' ) ) {
+	      			if ( 'name' in response['author'] ) {
+  	      				jQuery("#cite_author_name").val(response['author']['name']) ;
+    		  		}
+        			if ( 'photo' in response['author'] ) {
+          			jQuery("#cite_author_photo").val(response['author']['photo']) ;
+        			}
+        			if ( 'url' in response['author'] ) {
+          			jQuery("#cite_author_url").val(response['author']['url']) ;
+        			}
+			}
+			if ( 'category' in response ) {
+				jQuery("#cite_tags").val( response['category'].join(";") );
 			}
-			console.log(response);
+		alert( rest_object.link_preview_success_message );
+		console.log( response );
+		},
+	  fail: function( response ) {
+		  	console.log( response );
+			alert(response.message);
 		},
-	  error: function(request, status, error){
-			alert(request.responseText);
+	  error: function() {
+		  alert( 'Error' );
 		}
 	});
 })
diff --git a/includes/tabs/tab-author.php b/includes/tabs/tab-author.php
new file mode 100644
index 0000000..733f033
--- /dev/null
+++ b/includes/tabs/tab-author.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Provides the 'Author' view for the corresponding tab in the Post Meta Box.
+ *
+ * @package    Indieweb_Post_Kinds
+ */
+?>
+	
+<div class="inside hidden">
+	<div id="kindmetatab-author">
+	<h4> <?php _e( 'Information on the Author or Artist of the Piece', 'indieweb-post-kinds' ); ?></h4>
+		<?php echo self::metabox_text( 'cite_author_name', __( 'Author/Artist Name', 'indieweb-post-kinds' ), ifset( $author['name'] ), $type = 'text' ); ?>
+		<br />
+		<?php echo self::metabox_text( 'cite_author_url', __( 'Author/Artist URL', 'indieweb-post-kinds' ), ifset( $author['url'] ), $type = 'text' ); ?>
+		<br />
+		<?php echo self::metabox_text( 'cite_author_photo', __( 'Author/Artist Photo', 'indieweb-post-kinds' ), ifset( $author['photo'] ), $type = 'text' ); ?>
+		<br />
+	</div><!-- #kindmetatab-author -->
+
+
+</div>
diff --git a/includes/tabs/tab-citation.php b/includes/tabs/tab-citation.php
deleted file mode 100644
index c72a340..0000000
--- a/includes/tabs/tab-citation.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Provides the 'Citation' view for the corresponding tab in the Post Meta Box.
- *
- * @package    Indieweb_Post_Kinds
- */
-?>
-	
-<div class="inside hidden">
-	<p><?php _e( 'Details of the site you are responding to', 'indieweb-post-kinds' ); ?></p>
-		<div id="kindmetatab-citation">
-	 <br/>
-	<label for="summary"><?php _e( 'Summary', 'indieweb-post-kinds' ); ?></label><br/>
-	 <textarea name="cite[summary]" id="cite_summary" cols="70"><?php echo ifset( $cite['summary'] ); ?></textarea><br/>
-	  <label for="publication"><?php _e( 'Site Name/Publication/Album', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="text" name="cite[publication]" id="cite_publication" size="70" value="<?php echo ifset( $cite['publication'] ); ?>"/><br/>
-
-
-			<label for="featured"><?php _e( 'Featured Image', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="text" name="cite[featured]" id="cite_featured" size="70" value="<?php echo ifset( $cite['featured'] ); ?>" />
-	 <br/>
-	  <br />
-
-		</div> <!-- #kindmetatab-citation -->
-	<div id="kindmetatab-author">
-	  <label for="author_name"><?php _e( 'Author/Artist Name', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="text" name="author[name]" id="author_name" size="70" value="<?php echo ifset( $author['name'] ); ?>" />
-	  <br />
-
-	  <label for="url"><?php _e( 'Author/Artist URL', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="url" name="author[url]" id="author_url" size="70" value="<?php echo ifset( $author['url'] ); ?>" />
-	  <br />
-
-
-	  <label for="author_photo"><?php _e( 'Author Photo', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="text" name="author[photo]" id="author_photo" size="70" value="<?php echo ifset( $author['photo'] ); ?>" />
-	  <br />
-	</div><!-- #kindmetatab-author -->
-
-
-</div>
diff --git a/includes/tabs/tab-details.php b/includes/tabs/tab-details.php
new file mode 100644
index 0000000..cb474c9
--- /dev/null
+++ b/includes/tabs/tab-details.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Provides the 'Details' view for the corresponding tab in the Post Meta Box.
+ *
+ * @package    Indieweb_Post_Kinds
+ */
+?>
+	
+<div class="inside hidden">
+	<h4><?php _e( 'Information on what you are responding to', 'indieweb-post-kinds' ); ?></h4>
+		<div id="kindmetatab-details">
+ 			<?php echo self::metabox_text( 'cite_publication', __( 'Site Name/Publication/Album', 'indieweb-post-kinds' ), ifset( $cite['publication'] ), $type = 'text' ); ?>
+                	<br />
+
+			<?php echo self::metabox_text( 'cite_featured', __( 'Featured Image/Site Icon', 'indieweb-post-kinds' ), ifset( $cite['featured'] ), $type = 'url' ); ?>
+			<br />
+
+			 <?php echo self::kind_the_time( 'cite_published', __( 'Published/Released', 'indieweb-post-kinds' ), $meta->divide_time( ifset( $cite['published'] ) ) ); ?>
+		         <br />
+
+			<?php echo self::kind_the_time( 'cite_updated', __( 'Updated', 'indieweb-post-kinds' ), $meta->divide_time( ifset( $cite['updated'] ) ) ); ?>
+			<br />
+		</div> <!-- #kindmetatab-details -->
+</div>
diff --git a/includes/tabs/tab-location.php b/includes/tabs/tab-location.php
deleted file mode 100644
index 931bd60..0000000
--- a/includes/tabs/tab-location.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Provides the 'Location' view for the corresponding tab in the Post Meta Box.
- *
- * @package    Indieweb_Post_Kinds
- */
-?>
-<div class="inside">
-	<p>Add the URL and/or the Name You Wish to Respond To</p>
-	<div id="kindmetatab-location">
-			<label for="url"><?php _e( 'URL', 'indieweb-post-kinds' ); ?></label><br/>
-			<input type="url" name="url" id="cite_url" size="70" value="<?php echo ifset( $url ); ?>" />
-	  <button type="button" class="kind-retrieve-button button-primary">Retrieve</button>
-			<br/>
-	  <label for="name"><?php _e( 'Name/Title', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="text" name="cite[name]" id="cite_name" size="70" value="<?php echo ifset( $cite['name'] ); ?>" />
-			<br />
-
-		</div><!-- #kindmetatab-location -->
-	
-
-</div>
diff --git a/includes/tabs/tab-main.php b/includes/tabs/tab-main.php
new file mode 100644
index 0000000..9c63162
--- /dev/null
+++ b/includes/tabs/tab-main.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Provides the 'Main' view for the corresponding tab in the Post Meta Box.
+ *
+ * @package    Indieweb_Post_Kinds
+ */
+// FIXME: This is temporary
+if ( is_array( $url ) ) {
+	$url = $url[0];
+}
+
+if (  isset( $cite['category'] ) )  {
+	$tags = implode( ';', $cite['category'] );
+}
+else{ 
+	$tags = '';
+}
+
+?>
+<div class="inside">
+<h4><?php _e( 'Add the URL and/or the Name/Summary You Wish to Respond To. The Retrieve button will retrieve the URL and attempt to set the values.', 'indieweb-post-kinds' ); ?></h4>
+	<div id="kindmetatab-main">
+ 		<?php echo self::metabox_text( 'cite_url', __( 'URL', 'indieweb-post-kinds' ), ifset( $url ), $type = 'text' ); ?>
+		<?php if ( version_compare( PHP_VERSION, '5.3', '>' ) ) { ?>
+		<button type="button" class="kind-retrieve-button button-primary">Retrieve</button>
+		<?php } ?>
+		<br/>
+
+		<?php echo self::metabox_text( 'cite_name', __( 'Name/Title', 'indieweb-post-kinds' ), ifset( $cite['name'] ), $type = 'text' ); ?>
+                <br />
+
+		<?php echo self::metabox_text( 'cite_summary', __( 'Summary/Quote', 'indieweb-post-kinds' ), ifset( $cite['summary'] ), $type = 'textarea' ); ?>
+		<br />
+
+		<?php echo self::metabox_text( 'cite_tags', __( 'Tags (semicolon separated)', 'indieweb-post-kinds' ), $tags, $type = 'textarea' ); ?>
+		<br />
+		</div><!-- #kindmetatab-main -->
+	
+
+</div>
diff --git a/includes/tabs/tab-navigation.php b/includes/tabs/tab-navigation.php
index 5c06b89..196c52e 100644
--- a/includes/tabs/tab-navigation.php
+++ b/includes/tabs/tab-navigation.php
@@ -1,21 +1,16 @@
 <div id="kindproperties-navigation">
     <h2 class="nav-tab-wrapper current">
-        <a class="nav-tab nav-tab-active" href="javascript:;">Response</a>
-        <a class="nav-tab" href="javascript:;">Citation</a>
-        <a class="nav-tab" href="javascript:;">Time</a>
-				<?php
-					// Add Extra Location Tab to be Enabled only if Class Exists
-				if ( class_exists( 'class-sloc-meta' ) ) {
-					// echo '<a class="nav-tab" href="javascript:;">Location</a>';
-				}
-				?>
+	<a class="nav-tab nav-tab-active" href="javascript:;">Main</a>
+	<a class="nav-tab" href="javascript:;">Details</a>
+        <a class="nav-tab" href="javascript:;">Author</a>
+        <a class="nav-tab" href="javascript:;">Other</a>
 	</h2>
+
 	<?php
-		include_once( 'tab-response.php' );
-		include_once( 'tab-citation.php' );
-		include_once( 'tab-time.php' );
-	if ( class_exists( 'class-sloc-meta' ) ) {
-		// include_once( 'tab-location.php' );
-	}
+		include_once( 'tab-main.php' );
+		include_once( 'tab-details.php' );
+		include_once( 'tab-author.php' );
+		include_once( 'tab-other.php' );
 	?>
 </div>
+
diff --git a/includes/tabs/tab-other.php b/includes/tabs/tab-other.php
new file mode 100644
index 0000000..13de95c
--- /dev/null
+++ b/includes/tabs/tab-other.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Provides the 'Other' view for the corresponding tab in the Post Meta Box.
+ *
+ * @package    Indieweb_Post_Kinds
+ */
+?>
+	
+<div class="inside hidden">
+<h4><?php _e( 'Other Properties', 'indieweb-post-kinds' ); ?></h4>
+	<div id="kindmetatab-other">
+
+	<p> <?php _e( 'Start Time and End Time will be Used to Calculate Duration', 'indieweb-post-kinds' ); ?> </p>
+	<?php echo self::kind_the_time( 'mf2_start', __('Start Time', 'indieweb-post-kinds' ), $meta->divide_time( $meta->get( 'dt-start' ) ) ); ?>
+	<br />
+	<?php echo self::kind_the_time( 'mf2_end', __('End Time', 'indieweb-post-kinds' ), $meta->divide_time( $meta->get( 'dt-end' ) ) ); ?>
+	<br />
+	<?php echo self::rsvp_select( $meta->get( 'rsvp' ) ); ?>
+
+	</div><!-- #kindmetatab-other -->
+
+</div>
diff --git a/includes/tabs/tab-response.php b/includes/tabs/tab-response.php
deleted file mode 100644
index d593671..0000000
--- a/includes/tabs/tab-response.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Provides the 'Response' view for the corresponding tab in the Post Meta Box.
- *
- * @package    Indieweb_Post_Kinds
- */
-// FIXME: This is temporary
-if ( is_array( $url ) ) {
-	$url = $url[0];
-}
-?>
-<div class="inside">
-	<p>Add the URL and/or the Name You Wish to Respond To</p>
-	<div id="kindmetatab-response">
-			<label for="url"><?php _e( 'URL', 'indieweb-post-kinds' ); ?></label><br/>
-			<input type="url" name="url" id="cite_url" size="70" value="<?php echo ifset( $url ); ?>" />
-			<?php if ( version_compare( PHP_VERSION, '5.3', '>' ) ) { ?>
-				<button type="button" class="kind-retrieve-button button-primary">Retrieve</button>
-			<?php } ?>
-			<br/>
-	  <label for="name"><?php _e( 'Name/Title', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="text" name="cite[name]" id="cite_name" size="70" value="<?php echo ifset( $cite['name'] ); ?>" />
-			<br />
-
-		</div><!-- #kindmetatab-resources -->
-	
-
-</div>
diff --git a/includes/tabs/tab-time.php b/includes/tabs/tab-time.php
deleted file mode 100644
index d1e9661..0000000
--- a/includes/tabs/tab-time.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Provides the 'Time' view for the corresponding tab in the Post Meta Box.
- *
- * @package    Indieweb_Post_Kinds
- */
-
-$tzlist = self::kind_get_timezones();
-$tz_seconds = get_option( 'gmt_offset' ) * 3600;
-$offset = self::tz_seconds_to_offset( $tz_seconds );
-$start_offset = ifset( $time['start_offset'] ) ?: $offset;
-$end_offset = ifset( $time['end_offset'] ) ?: $offset;
-
-?>
-	
-<div class="inside hidden">
-	<p>Time Properties</p>
-	<div id="kindmetatab-time">
-	  <label for="published"><?php _e( 'Published/Start', 'indieweb-post-kinds' ); ?></label><br/> 
-	  <input type="date" name="time[start_date]" id="start_date" value="<?php echo ifset( $time['start_date'] ); ?>"/>
-	  <input type="time" name="time[start_time]" id="start_time" step="1" value="<?php echo ifset( $time['start_time'] ); ?>"/>
-	<select name="time[start_offset]" id="start_offset">
-		<?php
-		foreach ( $tzlist as $key => $value ) {
-			echo '<option value="' . $value . '"';
-			if ( $start_offset == $value ) {
-				echo ' selected';
-			}
-			echo '>GMT' . $value . '</option>';
-		}
-		?>
-	</select>
-<br/>
-	  <label for="updated"><?php _e( 'Updated/End', 'indieweb-post-kinds' ); ?></label><br/>
-	  <input type="date" name="time[end_date]" id="end_date" value="<?php echo ifset( $time['end_date'] ); ?>"/>
-	  <input type="time" name="time[end_time]" id="end_time" step="1" value="<?php echo ifset( $time['end_time'] ); ?>"/>
-	<select name="time[end_offset]" id="end_offset">
-		<?php
-		foreach ( $tzlist as $key => $value ) {
-			echo '<option value="' . $value . '"';
-			if ( $end_offset == $value ) {
-				echo ' selected';
-			}
-			echo '>GMT' . $value . '</option>';
-
-		}
-		?>
-	</select><br />
-	</div><!-- #kindmetatab-time -->
-
-</div>
diff --git a/includes/tabs/time.js b/includes/tabs/time.js
index 8e19e6d..688c9d6 100644
--- a/includes/tabs/time.js
+++ b/includes/tabs/time.js
@@ -3,23 +3,38 @@
 	  var elem = document.createElement('input');
  	 	elem.setAttribute('type', 'date');
  	 	if ( elem.type === 'text' ) {
-    	  $('#start_date').datepicker({
+    	  $('#mf2_start_date').datepicker({
 					dateFormat: "yy-mm-dd"
 				});
-				$('#end_date').datepicker({
+				$('#mf2_end_date').datepicker({
+					dateFormat: "yy-mm-dd"
+				});
+    	  $('#cite_published_date').datepicker({
+					dateFormat: "yy-mm-dd"
+				});
+				$('#cite_updated_date').datepicker({
 					dateFormat: "yy-mm-dd"
 				});
   	}
 		elem.setAttribute('type', 'time');
 		if ( elem.type === 'text' ) {
-				$('#start_time').timepicker({
+				$('#mf2_start_time').timepicker({
+					timeFormat: "H:i:s",
+					step: 15
+				});
+				$('#mf2_end_time').timepicker({
+					timeFormat: "H:i:s",
+					step: 15
+				});
+				$('#cite_published_time').timepicker({
 					timeFormat: "H:i:s",
 					step: 15
 				});
-				$('#end_time').timepicker({
+				$('#cite_updated_time').timepicker({
 					timeFormat: "H:i:s",
 					step: 15
 				});
+
 		}
 	});
 }(jQuery));
diff --git a/includes/views/kind.php b/includes/views/kind.php
index c00c2fe..feca6d4 100644
--- a/includes/views/kind.php
+++ b/includes/views/kind.php
@@ -4,72 +4,97 @@
  *	The Goal of this Template is to be a general all-purpose model that will be replaced by customization in other templates
  */
 
-$content = '<cite class="h-cite response ';
+$kind = get_post_kind_slug( get_the_ID() );
+$meta = new Kind_Meta( get_the_ID() );
+$author = Kind_View::get_hcard( $meta->get_author() );
+$cite = $meta->get_cite();
+$site_name = Kind_View::get_site_name( $meta->get_cite(), $meta->get_url() );
+$title = Kind_View::get_cite_title( $meta->get_cite(), $meta->get_url() );
+$embed = self::get_embed( $meta->get_url() );
+$rsvp = $meta->get( 'rsvp' );
+
 // Add in the appropriate type
 switch ( $kind ) {
 	case 'like':
-		  $content .= 'p-like-of';
+		$type = 'p-like-of';
 		break;
 	case 'favorite':
-		$content .= 'p-favorite-of';
+		$type = 'p-favorite-of';
 		break;
 	case 'repost':
-		$content .= 'p-repost-of';
+		$type = 'p-repost-of';
 		break;
 	case 'reply':
 	case 'rsvp':
-		$content .= 'p-in-reply-to';
+		$type = 'p-in-reply-to';
 		break;
 	case 'tag':
-		$content .= 'p-tag-of';
+		$type = 'p-tag-of';
 		break;
 	case 'bookmark':
-		$content .= 'p-bookmark-of';
+		$type = 'p-bookmark-of';
 		break;
 	case 'listen':
-		$content .= 'p-listen';
+		$type = 'p-listen';
 		break;
 	case 'watch':
-		$content .= 'p-watch';
+		$type = 'p-watch';
 		break;
 	case 'game':
-		$content .= 'p-play';
+		$type = 'p-play';
 		break;
 	case 'wish':
-		$content .= 'p-wish';
+		$type = 'p-wish';
 		break;
 	case 'read':
-		$content .= 'p-read-of';
-				break;
+		$type = 'p-read-of';
+		break;
 	case 'quote':
-		$content .= 'u-quotation-of';
-				break;
-}
-$content .= '">';
-$content .= Kind_Taxonomy::get_icon( $kind );
-$content .= self::get_cite_title( $meta->get_cite(), $meta->get_url() );
-$author = self::get_hcard( $meta->get_author() );
-if ( $author ) {
-	$content .= ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
-}
-$site_name = self::get_site_name( $meta->get_cite(), $meta->get_url() );
-if ( $site_name ) {
-	$content .= '<em>(<span class="p-publication">' . $site_name . '</span>)</em>';
+		$type = 'u-quotation-of';
+		break;
+	default:
+		$type = '';
+		break;
 }
-if ( in_array( $kind, array( 'jam', 'listen', 'play', 'read', 'watch' ) ) ) {
-	$duration = $meta->get_duration();
-	if ( $duration ) {
-		$content .= '(' . __( 'Duration: ', 'indieweb-post-kinds' ) . '<span class="p-duration">' . $duration . '</span>)';
+?>
+
+<section class="h-cite response <?php echo $type; ?> ">
+<header>
+<?php echo Kind_Taxonomy::get_icon( $kind );
+if( ! $embed ) {
+	if ( $title ) {
+		echo $title;
+	}
+	if ( $author ) {
+		echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+	}
+	if ( $site_name ) {
+		echo '<em>(<span class="p-publication">' . $site_name . '</span>)</em>';
+	}
+	if ( in_array( $kind, array( 'jam', 'listen', 'play', 'read', 'watch' ) ) ) {
+		$duration = $meta->get_duration();
+		if ( $duration ) {
+			echo '(' . __( 'Duration: ', 'indieweb-post-kinds' ) . '<span class="p-duration">' . $duration . '</span>)';
+		}
 	}
 }
+?>
+</header>
+<?php
 if ( $cite ) {
-	$embed = self::get_embed( $meta->get_url() );
 	if ( $embed ) {
-		$content .= sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+		echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
 	} else if ( array_key_exists( 'summary', $cite ) ) {
-		$content .= sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+		echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
 	}
 }
 
+if ( $rsvp ) {
+	echo 'RSVP <span class="p-rsvp">' . $rsvp . '</span>';
+}
+
 // Close Response
-$content .= '</cite>';
+?>
+</section>
+
+<?php
diff --git a/indieweb-post-kinds.php b/indieweb-post-kinds.php
index 729c01b..a26c2e5 100755
--- a/indieweb-post-kinds.php
+++ b/indieweb-post-kinds.php
@@ -7,7 +7,7 @@
  * Plugin Name: Post Kinds
  * Plugin URI: https://wordpress.org/plugins/indieweb-post-kinds/
  * Description: Ever want to reply to someone else's post with a post on your own site? Or to "like" someone else's post, but with your own site?
- * Version: 2.4.4
+ * Version: 2.5.0
  * Author: David Shanske
  * Author URI: https://david.shanske.com
  * Text Domain: indieweb-post-kinds
@@ -22,7 +22,7 @@
 add_action( 'plugins_loaded', array( 'Post_Kinds_Plugin', 'init' ) );
 
 class Post_Kinds_Plugin {
-	public static $version = '2.4.4';
+	public static $version = '2.5.0';
 	public static function init() {
 		load_plugin_textdomain( 'indieweb-post-kinds', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
 		// Add Kind Taxonomy.
@@ -68,9 +68,10 @@ public static function init() {
 			if ( ! class_exists( 'Mf2\Shim' ) ) {
 				require_once plugin_dir_path( __FILE__ ) . 'includes/Mf2/Twitter.php';
 			}
-			require_once plugin_dir_path( __FILE__ ) . 'includes/class-mf2-cleaner.php';
+			require_once plugin_dir_path( __FILE__ ) . 'includes/class-parse-mf2.php';
 		}
 		// Add Link Preview Parsing
+		require_once plugin_dir_path( __FILE__ ) . 'includes/class-parse-this.php';
 		require_once plugin_dir_path( __FILE__ ) . 'includes/class-link-preview.php';
 		add_action( 'init' , array( 'Link_Preview', 'init' ) );
 
@@ -96,12 +97,7 @@ public static function settings_link( $links ) {
 	 * Loads the Stylesheet for the Plugin.
 	 */
 	public static function style_load() {
-		$option = get_option( 'iwt_options', Kind_Config::Defaults() );
-		if ( ! isset( $option['themecompat'] ) ) {
-			wp_enqueue_style( 'kind', plugin_dir_url( __FILE__ ) . 'css/kind.min.css', array(), self::$version );
-		} else {
-			wp_enqueue_style( 'kind', plugin_dir_url( __FILE__ ) . 'css/kind.themecompat.min.css', array(), self::$version );
-		}
+		wp_enqueue_style( 'kind', plugin_dir_url( __FILE__ ) . 'css/kind.min.css', array(), self::$version );
 	}
 
 	/**
diff --git a/languages/post_kinds.pot b/languages/post_kinds.pot
index 8d9fa43..9168c0d 100644
--- a/languages/post_kinds.pot
+++ b/languages/post_kinds.pot
@@ -1,171 +1,217 @@
-# Copyright (C) 2016 David Shanske
+# Copyright (C) 2017 David Shanske
 # This file is distributed under the same license as the Post Kinds package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Post Kinds 2.4.2\n"
+"Project-Id-Version: Post Kinds 2.5.0\n"
 "Report-Msgid-Bugs-To: "
 "http://wordpress.org/support/plugin/indieweb-post-kinds\n"
-"POT-Creation-Date: 2016-09-02 03:08:25+00:00\n"
+"POT-Creation-Date: 2017-03-05 04:57:40+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "X-Generator: grunt-wp-i18n 0.4.9\n"
 
-#: includes/class-kind-config.php:51
+#: includes/class-kind-config.php:72
 msgid "Content Options"
 msgstr ""
 
-#: includes/class-kind-config.php:52
-msgid "Add Rich Embed Support for Facebook, Google Plus, Instagram, etc"
+#: includes/class-kind-config.php:79
+msgid "Select All Kinds You Wish to Use"
 msgstr ""
 
-#: includes/class-kind-config.php:53
-msgid ""
-"Extra Styling for Themes That May Not Support Post\n"
-"\t\t\t\t\tKinds. Includes hiding of titles on kinds that do not usually "
-"have an explicit title."
+#: includes/class-kind-config.php:86
+msgid "Default Kind"
 msgstr ""
 
-#: includes/class-kind-config.php:61
-msgid "Disable Post Formats"
+#: includes/class-kind-config.php:94
+msgid "Add Rich Embed Support for Whitelisted Sites"
 msgstr ""
 
-#: includes/class-kind-config.php:62
+#: includes/class-kind-config.php:101
 msgid "Disable Content Protection on Responses"
 msgstr ""
 
-#: includes/class-kind-config.php:64
+#: includes/class-kind-config.php:110
 msgid "Response Content Allowed Html Elements"
 msgstr ""
 
-#: includes/class-kind-config.php:66
-msgid "Select All Kinds You Wish to Use"
-msgstr ""
-
-#: includes/class-kind-config.php:67
-msgid "Default Kind"
-msgstr ""
-
 #. Plugin Name of the plugin/theme
 msgid "Post Kinds"
 msgstr ""
 
-#: includes/class-kind-config.php:202
+#: includes/class-kind-config.php:237
 msgid "Indieweb Post Kinds"
 msgstr ""
 
-#: includes/class-kind-config.php:204
+#: includes/class-kind-config.php:239
 msgid "Adds support for responding and interacting with other sites."
 msgstr ""
 
-#: includes/class-kind-config.php:226 includes/class-kind-tabmeta.php:109
+#: includes/class-kind-config.php:251 includes/class-kind-tabmeta.php:179
 msgid "Post Properties"
 msgstr ""
 
-#: includes/class-kind-config.php:227
+#: includes/class-kind-config.php:252
 msgid ""
 "\n"
-"\t\t\t\t\t\t<p> The Post Properties tab represents the Microformats "
-"properties of a Post. For different kinds of posts, the different\n"
-"\t\t\t\t\t\tfields mean something different. Example: Artist Name vs Author "
+"\t\t\t\t<p> The Post Properties tab represents the Microformats properties "
+"of a Post. For different kinds of posts, the different\n"
+"\t\t\t\tfields mean something different. Example: Artist Name vs Author "
 "Name</p>\n"
-"\t\t\t\t\t\t<ul><strong>Response</strong>\n"
-"\t\t\t\t\t\t\t<li><strong>URL</strong> - The URL the post is responding "
-"to</li>\n"
-"\t\t\t\t\t\t\t<li><strong>Name/Title</strong> - The name of what is being "
+"\t\t\t\t<ul><strong>Main</strong>\n"
+"\t\t\t\t\t<li><strong>URL</strong> - The URL the post is responding to</li>\n"
+"\t\t\t\t\t<li><strong>Name/Title</strong> - The name of what is being "
 "responded to</li>\n"
-"\t\t\t\t\t\t</ul>\n"
-"\t\t\t\t\t\t<ul><strong>Citation</strong>\n"
-"\t\t\t\t\t\t\t<li><strong>Summary</strong> - Summary of what the post is "
-"responding to</li>\n"
-"\t\t\t\t\t\t\t<li><strong>Site Name/Publication/Album</strong></li>\n"
-"\t\t\t\t\t\t\t<li><strong>Featured Image</strong> - The URL of a featured "
-"image of what is being responded to </li>\n"
-"\t\t\t\t\t\t\t<li><strong>Author/Artist Name</strong> </li>\n"
-"\t\t\t\t\t\t\t<li><strong>Author/Artist URL</strong></li>\n"
-"\t\t\t\t\t\t\t<li><strong>Author Photo URL</strong></li>\n"
-"\t\t\t\t\t\t</ul>\n"
-"            <ul><strong>Time</strong>\n"
-"              <li><strong>Start/Published Time</strong></li>\n"
-"              <li><strong>End/Updated Time</strong></li>\n"
-"            </ul>\n"
-"\n"
+"\t\t\t\t\t<li><strong>Summary/Quote</strong> - Summary of what the post is "
+"responding to or quote</li>\n"
+"\t\t\t\t\t<li><strong>Tags</strong> - Tags or categories for the piece to "
+"be displayed as hashtags</li>\n"
+"\t\t\t\t</ul>\n"
+"\t\t\t\t<ul><strong>Details</strong>\n"
+"\t\t\t\t\t<li><strong>Site Name/Publication/Album</strong></li>\n"
+"\t\t\t\t\t<li><strong>Featured Image/Site Icon</strong> - The URL of a "
+"featured image of what is being responded to or a site icon</li>\n"
+"              \t\t\t\t<li><strong>Published Time</strong></li>\n"
+"              \t\t\t\t<li><strong>Updated Time</strong></li>\n"
+"\t\t\t\t</ul>\n"
+"\t\t\t\t<ul><strong>Author</strong>\n"
+"\t\t\t\t\t<li><strong>Author/Artist Name</strong> </li>\n"
+"\t\t\t\t\t<li><strong>Author/Artist URL</strong></li>\n"
+"\t\t\t\t\t<li><strong>Author/Artist Photo URL</strong></li>\n"
+"\t\t\t\t</ul>\n"
+"\t\t\t\t<ul><strong>Other</strong>\n"
+"              \t\t\t\t<li><strong>Start Time</strong></li>\n"
+"              \t\t\t\t<li><strong>End Time</strong></li>\n"
+"\t\t\t\t\t<li><strong>Duration</strong> - Duration is calculated based on "
+"the difference between start and end time. You may just use the time field, "
 "\n"
+"\t\t\t\t\tomitting date and timezone and setting start time to 0:00:00 to "
+"set a simple duration.</li> \n"
+"\t\t\t\t\t<li><strong>RSVP</strong> - For RSVP posts, you can specify "
+"whether you are attending, not attending, unsure, or simply "
+"interested.</li>\n"
+"            \t\t\t</ul>\n"
 "\t\t\t"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:561
+#: includes/class-kind-tabmeta.php:65
+msgid "Your URL has been successfully retrieved and parsed"
+msgstr ""
+
+#: includes/class-kind-tabmeta.php:130
+msgid "Yes"
+msgstr ""
+
+#: includes/class-kind-tabmeta.php:131
+msgid "No"
+msgstr ""
+
+#: includes/class-kind-tabmeta.php:132
+msgid "Maybe"
+msgstr ""
+
+#: includes/class-kind-tabmeta.php:133
+msgid "Interested"
+msgstr ""
+
+#: includes/class-kind-tabmeta.php:135
+msgid "RSVP"
+msgstr ""
+
+#: includes/class-kind-taxonomy.php:572
 msgid "Invalid post"
 msgstr ""
 
-#: includes/class-link-preview.php:38
+#: includes/class-link-preview.php:101
+msgid "Missing or Invalid URL"
+msgstr ""
+
+#: includes/class-parse-mf2.php:14 includes/class-parse-this.php:121
 msgid "A valid URL was not provided."
 msgstr ""
 
-#: includes/class-link-preview.php:100
-msgid "Twitter"
+#: includes/tabs/tab-author.php:12
+msgid "Information on the Author or Artist of the Piece"
 msgstr ""
 
-#: includes/class-link-preview.php:110
-msgid "You must specify a URL"
+#: includes/tabs/tab-author.php:13
+msgid "Author/Artist Name"
 msgstr ""
 
-#: includes/class-link-preview.php:113
-msgid "Input is not a valid URL"
+#: includes/tabs/tab-author.php:15
+msgid "Author/Artist URL"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:11
-msgid "Details of the site you are responding to"
+#: includes/tabs/tab-author.php:17
+msgid "Author/Artist Photo"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:14
-msgid "Summary"
+#: includes/tabs/tab-details.php:11
+msgid "Information on what you are responding to"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:16
+#: includes/tabs/tab-details.php:13
 msgid "Site Name/Publication/Album"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:20
-msgid "Featured Image"
+#: includes/tabs/tab-details.php:16
+msgid "Featured Image/Site Icon"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:27
-msgid "Author/Artist Name"
+#: includes/tabs/tab-details.php:19
+msgid "Published/Released"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:31
-msgid "Author/Artist URL"
+#: includes/tabs/tab-details.php:22
+msgid "Updated"
 msgstr ""
 
-#: includes/tabs/tab-citation.php:36
-msgid "Author Photo"
+#: includes/tabs/tab-main.php:22
+msgid ""
+"Add the URL and/or the Name/Summary You Wish to Respond To. The Retrieve "
+"button will retrieve the URL and attempt to set the values."
 msgstr ""
 
-#: includes/tabs/tab-location.php:12 includes/tabs/tab-response.php:12
+#: includes/tabs/tab-main.php:24
 msgid "URL"
 msgstr ""
 
-#: includes/tabs/tab-location.php:16 includes/tabs/tab-response.php:18
+#: includes/tabs/tab-main.php:30
 msgid "Name/Title"
 msgstr ""
 
-#: includes/tabs/tab-time.php:20
-msgid "Published/Start"
+#: includes/tabs/tab-main.php:33
+msgid "Summary/Quote"
+msgstr ""
+
+#: includes/tabs/tab-main.php:36
+msgid "Tags (semicolon separated)"
+msgstr ""
+
+#: includes/tabs/tab-other.php:11
+msgid "Other Properties"
+msgstr ""
+
+#: includes/tabs/tab-other.php:14
+msgid "Start Time and End Time will be Used to Calculate Duration"
+msgstr ""
+
+#: includes/tabs/tab-other.php:15
+msgid "Start Time"
 msgstr ""
 
-#: includes/tabs/tab-time.php:35
-msgid "Updated/End"
+#: includes/tabs/tab-other.php:17
+msgid "End Time"
 msgstr ""
 
-#: includes/views/kind.php:53
+#: includes/views/kind.php:69
 msgid "by"
 msgstr ""
 
-#: includes/views/kind.php:62
+#: includes/views/kind.php:77
 msgid "Duration: "
 msgstr ""
 
@@ -187,473 +233,488 @@ msgstr ""
 msgid "https://david.shanske.com"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:75 includes/class-kind-taxonomy.php:89
+#: includes/class-kind-taxonomy.php:103
 msgctxt "indieweb-post-kinds"
 msgid "Kinds"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:76
+#: includes/class-kind-taxonomy.php:104
 msgctxt "indieweb-post-kinds"
 msgid "Kind"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:77
+#: includes/class-kind-taxonomy.php:105
 msgctxt "indieweb-post-kinds"
 msgid "Search Kinds"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:78
+#: includes/class-kind-taxonomy.php:106
 msgctxt "indieweb-post-kinds"
 msgid "Popular Kinds"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:79
+#: includes/class-kind-taxonomy.php:107
 msgctxt "indieweb-post-kinds"
 msgid "All Kinds"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:80
+#: includes/class-kind-taxonomy.php:108
 msgctxt "indieweb-post-kinds"
 msgid "Parent Kind"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:81
+#: includes/class-kind-taxonomy.php:109
 msgctxt "indieweb-post-kinds"
 msgid "Parent Kind:"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:82
+#: includes/class-kind-taxonomy.php:110
 msgctxt "indieweb-post-kinds"
 msgid "Edit Kind"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:83
+#: includes/class-kind-taxonomy.php:111
+msgctxt "indieweb-post-kinds"
+msgid "View Kind"
+msgstr ""
+
+#: includes/class-kind-taxonomy.php:112
 msgctxt "indieweb-post-kinds"
 msgid "Update Kind"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:84
+#: includes/class-kind-taxonomy.php:113
 msgctxt "indieweb-post-kinds"
 msgid "Add New Kind"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:85
+#: includes/class-kind-taxonomy.php:114
 msgctxt "indieweb-post-kinds"
 msgid "New Kind"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:86
+#: includes/class-kind-taxonomy.php:115
 msgctxt "indieweb-post-kinds"
 msgid "Separate kinds with commas"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:87
+#: includes/class-kind-taxonomy.php:116
 msgctxt "indieweb-post-kinds"
 msgid "Add or remove kinds"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:88
+#: includes/class-kind-taxonomy.php:117
 msgctxt "indieweb-post-kinds"
 msgid "Choose from the most used kinds"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:208
+#: includes/class-kind-taxonomy.php:118
+msgctxt "indieweb-post-kinds"
+msgid "No kinds found"
+msgstr ""
+
+#: includes/class-kind-taxonomy.php:119
+msgctxt "indieweb-post-kinds"
+msgid "No kinds"
+msgstr ""
+
+#: includes/class-kind-taxonomy.php:226
 msgctxt "indieweb-post-kinds"
 msgid "Article"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:209
+#: includes/class-kind-taxonomy.php:227
 msgctxt "indieweb-post-kinds"
 msgid "Note"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:210
+#: includes/class-kind-taxonomy.php:228
 msgctxt "indieweb-post-kinds"
 msgid "Reply"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:211
+#: includes/class-kind-taxonomy.php:229
 msgctxt "indieweb-post-kinds"
 msgid "Repost"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:212
+#: includes/class-kind-taxonomy.php:230
 msgctxt "indieweb-post-kinds"
 msgid "Like"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:213
+#: includes/class-kind-taxonomy.php:231
 msgctxt "indieweb-post-kinds"
 msgid "Favorite"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:214
+#: includes/class-kind-taxonomy.php:232
 msgctxt "indieweb-post-kinds"
 msgid "Bookmark"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:215
+#: includes/class-kind-taxonomy.php:233
 msgctxt "indieweb-post-kinds"
 msgid "Photo"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:216
+#: includes/class-kind-taxonomy.php:234
 msgctxt "indieweb-post-kinds"
 msgid "Tag"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:217
+#: includes/class-kind-taxonomy.php:235
 msgctxt "indieweb-post-kinds"
 msgid "RSVP"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:218
+#: includes/class-kind-taxonomy.php:236
 msgctxt "indieweb-post-kinds"
 msgid "Listen"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:219
+#: includes/class-kind-taxonomy.php:237
 msgctxt "indieweb-post-kinds"
 msgid "Watch"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:220
+#: includes/class-kind-taxonomy.php:238
 msgctxt "indieweb-post-kinds"
 msgid "Checkin"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:221
+#: includes/class-kind-taxonomy.php:239
 msgctxt "indieweb-post-kinds"
 msgid "Wish"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:222
+#: includes/class-kind-taxonomy.php:240
 msgctxt "indieweb-post-kinds"
 msgid "Play"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:223 includes/class-kind-taxonomy.php:261
+#: includes/class-kind-taxonomy.php:241 includes/class-kind-taxonomy.php:279
 msgctxt "indieweb-post-kinds"
 msgid "Weather"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:224
+#: includes/class-kind-taxonomy.php:242
 msgctxt "indieweb-post-kinds"
 msgid "Exercise"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:225
+#: includes/class-kind-taxonomy.php:243
 msgctxt "indieweb-post-kinds"
 msgid "Travel"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:226
+#: includes/class-kind-taxonomy.php:244
 msgctxt "indieweb-post-kinds"
 msgid "Itinerary"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:227 includes/class-kind-taxonomy.php:265
+#: includes/class-kind-taxonomy.php:245 includes/class-kind-taxonomy.php:283
 msgctxt "indieweb-post-kinds"
 msgid "Eat"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:228
+#: includes/class-kind-taxonomy.php:246
 msgctxt "indieweb-post-kinds"
 msgid "Drink"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:229
+#: includes/class-kind-taxonomy.php:247
 msgctxt "indieweb-post-kinds"
 msgid "Follow"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:230
+#: includes/class-kind-taxonomy.php:248
 msgctxt "indieweb-post-kinds"
 msgid "Jam"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:231 includes/class-kind-taxonomy.php:269
+#: includes/class-kind-taxonomy.php:249 includes/class-kind-taxonomy.php:287
 msgctxt "indieweb-post-kinds"
 msgid "Read"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:232
+#: includes/class-kind-taxonomy.php:250
 msgctxt "indieweb-post-kinds"
 msgid "Quote"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:233
+#: includes/class-kind-taxonomy.php:251
 msgctxt "indieweb-post-kinds"
 msgid "Mood"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:234
+#: includes/class-kind-taxonomy.php:252
 msgctxt "indieweb-post-kinds"
 msgid "Recipe"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:246
+#: includes/class-kind-taxonomy.php:264
 msgctxt "indieweb-post-kinds"
 msgid "Articles"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:247
+#: includes/class-kind-taxonomy.php:265
 msgctxt "indieweb-post-kinds"
 msgid "Notes"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:248
+#: includes/class-kind-taxonomy.php:266
 msgctxt "indieweb-post-kinds"
 msgid "Replies"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:249
+#: includes/class-kind-taxonomy.php:267
 msgctxt "indieweb-post-kinds"
 msgid "Reposts"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:250
+#: includes/class-kind-taxonomy.php:268
 msgctxt "indieweb-post-kinds"
 msgid "Likes"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:251
+#: includes/class-kind-taxonomy.php:269
 msgctxt "indieweb-post-kinds"
 msgid "Favorites"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:252
+#: includes/class-kind-taxonomy.php:270
 msgctxt "indieweb-post-kinds"
 msgid "Bookmarks"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:253
+#: includes/class-kind-taxonomy.php:271
 msgctxt "indieweb-post-kinds"
 msgid "Photos"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:254
+#: includes/class-kind-taxonomy.php:272
 msgctxt "indieweb-post-kinds"
 msgid "Tags"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:255
+#: includes/class-kind-taxonomy.php:273
 msgctxt "indieweb-post-kinds"
 msgid "RSVPs"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:256
+#: includes/class-kind-taxonomy.php:274
 msgctxt "indieweb-post-kinds"
 msgid "Listens"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:257
+#: includes/class-kind-taxonomy.php:275
 msgctxt "indieweb-post-kinds"
 msgid "Watches"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:258
+#: includes/class-kind-taxonomy.php:276
 msgctxt "indieweb-post-kinds"
 msgid "Checkins"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:259
+#: includes/class-kind-taxonomy.php:277
 msgctxt "indieweb-post-kinds"
 msgid "Wishlist"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:260
+#: includes/class-kind-taxonomy.php:278
 msgctxt "indieweb-post-kinds"
 msgid "Plays"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:262
+#: includes/class-kind-taxonomy.php:280
 msgctxt "indieweb-post-kinds"
 msgid "Exercises"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:263
+#: includes/class-kind-taxonomy.php:281
 msgctxt "indieweb-post-kinds"
 msgid "Travels"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:264
+#: includes/class-kind-taxonomy.php:282
 msgctxt "indieweb-post-kinds"
 msgid "Itineraries"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:266
+#: includes/class-kind-taxonomy.php:284
 msgctxt "indieweb-post-kinds"
 msgid "Drinks"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:267
+#: includes/class-kind-taxonomy.php:285
 msgctxt "indieweb-post-kinds"
 msgid "Follows"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:268
+#: includes/class-kind-taxonomy.php:286
 msgctxt "indieweb-post-kinds"
 msgid "Jams"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:270
+#: includes/class-kind-taxonomy.php:288
 msgctxt "indieweb-post-kinds"
 msgid "Quotes"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:271
+#: includes/class-kind-taxonomy.php:289
 msgctxt "indieweb-post-kinds"
 msgid "Moods"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:272
+#: includes/class-kind-taxonomy.php:290
 msgctxt "indieweb-post-kinds"
 msgid "Recipes"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:284 includes/class-kind-taxonomy.php:285
-#: includes/class-kind-taxonomy.php:291
+#: includes/class-kind-taxonomy.php:302 includes/class-kind-taxonomy.php:303
+#: includes/class-kind-taxonomy.php:309
 msgctxt "indieweb-post-kinds"
 msgid " "
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:286
+#: includes/class-kind-taxonomy.php:304
 msgctxt "indieweb-post-kinds"
 msgid "In Reply To"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:287
+#: includes/class-kind-taxonomy.php:305
 msgctxt "indieweb-post-kinds"
 msgid "Reposted"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:288
+#: includes/class-kind-taxonomy.php:306
 msgctxt "indieweb-post-kinds"
 msgid "Liked"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:289
+#: includes/class-kind-taxonomy.php:307
 msgctxt "indieweb-post-kinds"
 msgid "Favorited"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:290
+#: includes/class-kind-taxonomy.php:308
 msgctxt "indieweb-post-kinds"
 msgid "Bookmarked"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:292
+#: includes/class-kind-taxonomy.php:310
 msgctxt "indieweb-post-kinds"
 msgid "Tagged"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:293
+#: includes/class-kind-taxonomy.php:311
 msgctxt "indieweb-post-kinds"
 msgid "RSVPed"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:294
+#: includes/class-kind-taxonomy.php:312
 msgctxt "indieweb-post-kinds"
 msgid "Listened to "
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:295
+#: includes/class-kind-taxonomy.php:313
 msgctxt "indieweb-post-kinds"
 msgid "Watched"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:296
+#: includes/class-kind-taxonomy.php:314
 msgctxt "indieweb-post-kinds"
 msgid "Checked In At"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:297
+#: includes/class-kind-taxonomy.php:315
 msgctxt "indieweb-post-kinds"
 msgid "Desires"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:298
+#: includes/class-kind-taxonomy.php:316
 msgctxt "indieweb-post-kinds"
 msgid "Played"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:299
+#: includes/class-kind-taxonomy.php:317
 msgctxt "indieweb-post-kinds"
 msgid "Weathered"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:300
+#: includes/class-kind-taxonomy.php:318
 msgctxt "indieweb-post-kinds"
 msgid "Exercised"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:301 includes/class-kind-taxonomy.php:302
+#: includes/class-kind-taxonomy.php:319 includes/class-kind-taxonomy.php:320
 msgctxt "indieweb-post-kinds"
 msgid "Traveled"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:303
+#: includes/class-kind-taxonomy.php:321
 msgctxt "indieweb-post-kinds"
 msgid "Ate"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:304
+#: includes/class-kind-taxonomy.php:322
 msgctxt "indieweb-post-kinds"
 msgid "Drank"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:305
+#: includes/class-kind-taxonomy.php:323
 msgctxt "indieweb-post-kinds"
 msgid "Followed"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:306
+#: includes/class-kind-taxonomy.php:324
 msgctxt "indieweb-post-kinds"
 msgid "Listened to"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:307
+#: includes/class-kind-taxonomy.php:325
 msgctxt "indieweb-post-kinds"
 msgid "Is Reading"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:308
+#: includes/class-kind-taxonomy.php:326
 msgctxt "indieweb-post-kinds"
 msgid "Quoted"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:309
+#: includes/class-kind-taxonomy.php:327
 msgctxt "indieweb-post-kinds"
 msgid "Felt"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:310
+#: includes/class-kind-taxonomy.php:328
 msgctxt "indieweb-post-kinds"
 msgid "Cooked"
 msgstr ""
 
-#: includes/class-kind-taxonomy.php:356
+#: includes/class-kind-taxonomy.php:374
 msgctxt "indieweb-post-kinds"
 msgid "this"
 msgstr ""
 
-#: includes/class-kind-view.php:165
+#: includes/class-kind-view.php:144
 msgctxt "indieweb-post-kinds"
 msgid "a tweet"
 msgstr ""
 
-#: includes/class-kind-view.php:166 includes/class-kind-view.php:167
+#: includes/class-kind-view.php:145 includes/class-kind-view.php:146
 msgctxt "indieweb-post-kinds"
 msgid "a video"
 msgstr ""
 
-#: includes/class-kind-view.php:168
+#: includes/class-kind-view.php:147
 msgctxt "indieweb-post-kinds"
 msgid "an image"
 msgstr ""
 
-#: includes/class-kind-view.php:174
+#: includes/class-kind-view.php:153
 msgctxt "indieweb-post-kinds"
 msgid "a post"
 msgstr ""
\ No newline at end of file
diff --git a/package.json b/package.json
index 9e0351e..05e8691 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,9 @@
     "grunt-remove": "~0.1.0",
     "grunt-text-replace": "~0.4.0",
     "grunt-contrib-clean": "~0.6.0",
-    "grunt-svn-checkout": "~0.1.1"
+    "grunt-svn-checkout": "~0.1.1",
+    "grunt-svgmin": "~3.1.2",
+    "grunt-svg-sprite": "~1.3.3",
+    "grunt-svgstore": "~1.0.0"
   }
 }
diff --git a/readme.md b/readme.md
index 665370a..0e8a438 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
 # Post Kinds #
 **Contributors:** dshanske  
 **Tags:** indieweb, interaction, posts, webmention, share, like  
-**Stable tag:** 2.4.4  
+**Stable tag:** 2.5.0  
 **Requires at least:** 4.7  
 **Tested up to:** 4.7.2  
 **License:** GPLv2 or later  
@@ -50,6 +50,10 @@ The plugin requires the [webmention](https://wordpress.org/plugins/webmention/)
 
 ## Upgrade Notice ##
 
+### 2.5.0 ###
+
+Settings have been completely changed and you will have to reset.
+
 ### 2.4.2 ###
 
 Due to changes in the Micropub plugin, multiple values for properties are now supported. 
@@ -98,6 +102,7 @@ may make it a Passive Kind.
  * **Favorite** - special to the favoriter
  * **Bookmark** - This is basically sharing/storing a link/bookmark. 
  * **Quote** - Quoted Content
+ * **RSVP** - A specific type of Reply regarding an event
 ### The Passive Kinds ###
 
 To "Scrobble" a song is when listening to it, you would make it a post on
@@ -125,10 +130,8 @@ interface at this time.
  * **Itinerary** - Itinerary - this would refer to scheduled transit, plane, train, etc. and does not require location awareness
  * **Check-In** - Identifying you are at a place. This would use the extended WordPress Geodata. It will require the Simple Location plugin to add location awareness to posts.
  * **Tag** - Allows you to tag a post as being of a specific tag, or person tagging.
- * **RSVP** - A specific type of Reply regarding an event
- * **Event** - An event post is one announcing an upcoming event
- * **Food** - Representing recording what you eat, perhaps for a food diary
- * **Drink** - Similar to Food
+ * **Eat** - Representing recording what you eat, perhaps for a food diary
+ * **Drink** - Similar to Eat
  * **Follow** - A post indicating you are now following someone's activities
  * **Mood** - Mood - Feeling
  * **Recipe** - Recipe
@@ -142,12 +145,35 @@ Simply replace YOURSITE.COM with your particular site name and the particular po
 
 Post Kinds also automatically handles RSS feeds which can be made available or subscribed to for any of the particular kinds. The RSS feed for all the posts marked as "note", for example could be found at either the URL `http://www.example.com/kind/note/feed` or  `http://www.example.com/feed/?kind=note` (if one doesn't have pretty permalinks enabled). Others can be obtained by replacing "note" with the other kinds.
 
+## Bookmarklet Configuration ##
+
+* If you add `?kindurl=URL` to the post editor URL, it will automatically fill this into the URL box in post properties
+* If you add `?kind=like` to the post editor URL, it will automatically set the kind.
+
+So - `https://www.example.com/wp-admin/post-new.php?kindurl=URL&kind=like` will automatically set a like with the URL URL
+
 ## SNAP ##
 
 Indieweb Post Kinds had support for replying to Twitter posts using the Social Network Auto Poster plugin. The developers of that plugin have not contacted the
 developer of this plugin.
 
 ## Changelog ##
+	= Version 2.5.0 =
+		* Parsing code now rewritten to add Parse This class based on Press This parsing code
+		* MF2 parsing code rewritten and consolidated - future improvements coming
+		* Link Preview class now supports AJAX over REST API instead of admin-ajax
+		* Start/End and Published/Updated Separated in UI
+		* Duration is calculated and saved when post is saved based on start and end dates
+		* RSVP property created and the RSVP kind now available as an option
+		* Tags now an option for a reply-context and will be displayed as hashtags in future.
+		* Facebook manual embed code removed as Facebook is now supported by WordPress as of 4.7 for embeds
+		* Google Plus manual embed code removed even though Google Plus is not supported mostly because did not wish to maintain as sole exception
+		* Add whitelist - oembed will only be used if one of the officially whitelisted sites is there(Filter Available). Otherwise it will use the link-preview generation. Option to disable.
+		* Set default post format based on post kind.
+		* Redoing of options and removal of option to remove post formats support and theme compat
+		* Update help description
+		* Fix Mood SVG
+		* Cleanup and removal of older code
 	= Version 2.4.4 =
 		* Simplify coding standards issues
 		* Update settings
diff --git a/readme.txt b/readme.txt
index 0f32151..3280af3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 === Post Kinds ===
 Contributors: dshanske
 Tags: indieweb, interaction, posts, webmention, share, like
-Stable tag: 2.4.4
+Stable tag: 2.5.0
 Requires at least: 4.7
 Tested up to: 4.7.2
 License: GPLv2 or later
@@ -46,6 +46,10 @@ The plugin requires the [webmention](https://wordpress.org/plugins/webmention/)
 
 == Upgrade Notice ==
 
+= 2.5.0 =
+
+Settings have been completely changed and you will have to reset.
+
 = 2.4.2 =
 
 Due to changes in the Micropub plugin, multiple values for properties are now supported. 
@@ -94,6 +98,7 @@ may make it a Passive Kind.
  * **Favorite** - special to the favoriter
  * **Bookmark** - This is basically sharing/storing a link/bookmark. 
  * **Quote** - Quoted Content
+ * **RSVP** - A specific type of Reply regarding an event
 = The Passive Kinds =
 
 To "Scrobble" a song is when listening to it, you would make it a post on
@@ -121,10 +126,8 @@ interface at this time.
  * **Itinerary** - Itinerary - this would refer to scheduled transit, plane, train, etc. and does not require location awareness
  * **Check-In** - Identifying you are at a place. This would use the extended WordPress Geodata. It will require the Simple Location plugin to add location awareness to posts.
  * **Tag** - Allows you to tag a post as being of a specific tag, or person tagging.
- * **RSVP** - A specific type of Reply regarding an event
- * **Event** - An event post is one announcing an upcoming event
- * **Food** - Representing recording what you eat, perhaps for a food diary
- * **Drink** - Similar to Food
+ * **Eat** - Representing recording what you eat, perhaps for a food diary
+ * **Drink** - Similar to Eat
  * **Follow** - A post indicating you are now following someone's activities
  * **Mood** - Mood - Feeling
  * **Recipe** - Recipe
@@ -138,12 +141,35 @@ Simply replace YOURSITE.COM with your particular site name and the particular po
 
 Post Kinds also automatically handles RSS feeds which can be made available or subscribed to for any of the particular kinds. The RSS feed for all the posts marked as "note", for example could be found at either the URL `http://www.example.com/kind/note/feed` or  `http://www.example.com/feed/?kind=note` (if one doesn't have pretty permalinks enabled). Others can be obtained by replacing "note" with the other kinds.
 
+== Bookmarklet Configuration ==
+
+* If you add `?kindurl=URL` to the post editor URL, it will automatically fill this into the URL box in post properties
+* If you add `?kind=like` to the post editor URL, it will automatically set the kind.
+
+So - `https://www.example.com/wp-admin/post-new.php?kindurl=URL&kind=like` will automatically set a like with the URL URL
+
 == SNAP ==
 
 Indieweb Post Kinds had support for replying to Twitter posts using the Social Network Auto Poster plugin. The developers of that plugin have not contacted the
 developer of this plugin.
 
 == Changelog ==
+	= Version 2.5.0 =
+		* Parsing code now rewritten to add Parse This class based on Press This parsing code
+		* MF2 parsing code rewritten and consolidated - future improvements coming
+		* Link Preview class now supports AJAX over REST API instead of admin-ajax
+		* Start/End and Published/Updated Separated in UI
+		* Duration is calculated and saved when post is saved based on start and end dates
+		* RSVP property created and the RSVP kind now available as an option
+		* Tags now an option for a reply-context and will be displayed as hashtags in future.
+		* Facebook manual embed code removed as Facebook is now supported by WordPress as of 4.7 for embeds
+		* Google Plus manual embed code removed even though Google Plus is not supported mostly because did not wish to maintain as sole exception
+		* Add whitelist - oembed will only be used if one of the officially whitelisted sites is there(Filter Available). Otherwise it will use the link-preview generation. Option to disable.
+		* Set default post format based on post kind.
+		* Redoing of options and removal of option to remove post formats support and theme compat
+		* Update help description
+		* Fix Mood SVG
+		* Cleanup and removal of older code
 	= Version 2.4.4 =
 		* Simplify coding standards issues
 		* Update settings
diff --git a/svgs/bookmark.svg b/svgs/bookmark.svg
index 06ac708..cf72816 100644
--- a/svgs/bookmark.svg
+++ b/svgs/bookmark.svg
@@ -1 +1,2 @@
-<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1420 128q23 0 44 9 33 13 52.5 41t19.5 62v1289q0 34-19.5 62t-52.5 41q-19 8-44 8-48 0-83-32l-441-424-441 424q-36 33-83 33-23 0-44-9-33-13-52.5-41t-19.5-62v-1289q0-34 19.5-62t52.5-41q21-9 44-9h1048z"/></svg>
\ No newline at end of file
+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg">
+<path d="M1420 128q23 0 44 9 33 13 52.5 41t19.5 62v1289q0 34-19.5 62t-52.5 41q-19 8-44 8-48 0-83-32l-441-424-441 424q-36 33-83 33-23 0-44-9-33-13-52.5-41t-19.5-62v-1289q0-34 19.5-62t52.5-41q21-9 44-9h1048z"/></svg>
diff --git a/svgs/mood.svg b/svgs/mood.svg
index f7cf250..304766d 100644
--- a/svgs/mood.svg
+++ b/svgs/mood.svg
@@ -1,542 +1,22 @@
-
-
-
-
-<!DOCTYPE html>
-<html lang="en" class="">
-  <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# object: http://ogp.me/ns/object# article: http://ogp.me/ns/article# profile: http://ogp.me/ns/profile#">
-    <meta charset='utf-8'>
-    
-
-    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/frameworks-a44e0bdd1666101af23963e4027cd7a0a1eea1339e0e7422524f2e7f3900e86b.css" media="all" rel="stylesheet" />
-    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/github-ac9c637b29122a4699fcd4d205b2d09efa4d4962d369158f7d907123061143f1.css" media="all" rel="stylesheet" />
-    
-    
-    <link crossorigin="anonymous" href="https://assets-cdn.github.com/assets/site-052f19062b5cc9c804bcfe6c835ee11a90f898e7524d1609f639301a5eb7cd1d.css" media="all" rel="stylesheet" />
-    
-
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta http-equiv="Content-Language" content="en">
-    <meta name="viewport" content="width=device-width">
-    
-    <title>moodkind/mood.svg at master · acegiak/moodkind · GitHub</title>
-    <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
-    <link rel="fluid-icon" href="https://github.com/fluidicon.png" title="GitHub">
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
-    <meta property="fb:app_id" content="1401488693436528">
-
-      <meta content="https://avatars1.githubusercontent.com/u/698430?v=3&amp;s=400" name="twitter:image:src" /><meta content="@github" name="twitter:site" /><meta content="summary" name="twitter:card" /><meta content="acegiak/moodkind" name="twitter:title" /><meta content="moodkind - adds mood tracking functionality to the indiweb post kinds plugin for wordpress" name="twitter:description" />
-      <meta content="https://avatars1.githubusercontent.com/u/698430?v=3&amp;s=400" property="og:image" /><meta content="GitHub" property="og:site_name" /><meta content="object" property="og:type" /><meta content="acegiak/moodkind" property="og:title" /><meta content="https://github.com/acegiak/moodkind" property="og:url" /><meta content="moodkind - adds mood tracking functionality to the indiweb post kinds plugin for wordpress" property="og:description" />
-      <meta name="browser-stats-url" content="https://api.github.com/_private/browser/stats">
-    <meta name="browser-errors-url" content="https://api.github.com/_private/browser/errors">
-    <link rel="assets" href="https://assets-cdn.github.com/">
-    
-    <meta name="pjax-timeout" content="1000">
-    
-    <meta name="request-id" content="AAF6:1B3DC:13513E7:1EC9F97:589BF7C4" data-pjax-transient>
-    
-
-    <meta name="msapplication-TileImage" content="/windows-tile.png">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="selected-link" value="repo_source" data-pjax-transient>
-
-    <meta name="google-site-verification" content="KT5gs8h0wvaagLKAVWq8bbeNwnZZK1r1XQysX3xurLU">
-<meta name="google-site-verification" content="ZzhVyEFwb7w3e0-uOTltm8Jsck2F5StVihD0exw2fsA">
-    <meta name="google-analytics" content="UA-3769691-2">
-
-<meta content="collector.githubapp.com" name="octolytics-host" /><meta content="github" name="octolytics-app-id" /><meta content="https://collector.githubapp.com/github-external/browser_event" name="octolytics-event-url" /><meta content="AAF6:1B3DC:13513E7:1EC9F97:589BF7C4" name="octolytics-dimension-request_id" />
-<meta content="/&lt;user-name&gt;/&lt;repo-name&gt;/blob/show" data-pjax-transient="true" name="analytics-location" />
-
-
-
-  <meta class="js-ga-set" name="dimension1" content="Logged Out">
-
-
-
-        <meta name="hostname" content="github.com">
-    <meta name="user-login" content="">
-
-        <meta name="expected-hostname" content="github.com">
-      <meta name="js-proxy-site-detection-payload" content="NWJkNzEyODExYjgwNGQ1NzY4MDljMzE4ZjcyODY0NjZmMDEwYzhkODdlZjEyY2RhYjNkOTE0Y2FjNDkzM2E5Mnx7InJlbW90ZV9hZGRyZXNzIjoiMTA3LjE1NS44Ny4xMzMiLCJyZXF1ZXN0X2lkIjoiQUFGNjoxQjNEQzoxMzUxM0U3OjFFQzlGOTc6NTg5QkY3QzQiLCJ0aW1lc3RhbXAiOjE0ODY2MTY1MTYsImhvc3QiOiJnaXRodWIuY29tIn0=">
-
-
-      <link rel="mask-icon" href="https://assets-cdn.github.com/pinned-octocat.svg" color="#000000">
-      <link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico">
-
-    <meta name="html-safe-nonce" content="9d43311136192a62215bd40fadc9167a40848fd1">
-
-    <meta http-equiv="x-pjax-version" content="7287479fbeca568e63cf0e9a001babda">
-    
-
-      
-  <meta name="description" content="moodkind - adds mood tracking functionality to the indiweb post kinds plugin for wordpress">
-  <meta name="go-import" content="github.com/acegiak/moodkind git https://github.com/acegiak/moodkind.git">
-
-  <meta content="698430" name="octolytics-dimension-user_id" /><meta content="acegiak" name="octolytics-dimension-user_login" /><meta content="54202219" name="octolytics-dimension-repository_id" /><meta content="acegiak/moodkind" name="octolytics-dimension-repository_nwo" /><meta content="true" name="octolytics-dimension-repository_public" /><meta content="false" name="octolytics-dimension-repository_is_fork" /><meta content="54202219" name="octolytics-dimension-repository_network_root_id" /><meta content="acegiak/moodkind" name="octolytics-dimension-repository_network_root_nwo" />
-  <link href="https://github.com/acegiak/moodkind/commits/master.atom" rel="alternate" title="Recent Commits to moodkind:master" type="application/atom+xml">
-
-
-      <link rel="canonical" href="https://github.com/acegiak/moodkind/blob/master/svg/mood.svg" data-pjax-transient>
-  </head>
-
-
-  <body class="logged-out  env-production  vis-public page-blob">
-    <div id="js-pjax-loader-bar" class="pjax-loader-bar"><div class="progress"></div></div>
-    <a href="#start-of-content" tabindex="1" class="accessibility-aid js-skip-to-content">Skip to content</a>
-
-    
-    
-    
-
-
-
-          <header class="site-header js-details-container Details alt-body-font" role="banner">
-  <div class="container-responsive">
-    <a class="header-logo-invertocat" href="https://github.com/" aria-label="Homepage" data-ga-click="(Logged out) Header, go to homepage, icon:logo-wordmark">
-      <svg aria-hidden="true" class="octicon octicon-mark-github" height="32" version="1.1" viewBox="0 0 16 16" width="32"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
-    </a>
-
-    <button class="btn-link float-right site-header-toggle js-details-target" type="button" aria-label="Toggle navigation">
-      <svg aria-hidden="true" class="octicon octicon-three-bars" height="24" version="1.1" viewBox="0 0 12 16" width="18"><path fill-rule="evenodd" d="M11.41 9H.59C0 9 0 8.59 0 8c0-.59 0-1 .59-1H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zm0-4H.59C0 5 0 4.59 0 4c0-.59 0-1 .59-1H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1h.01zM.59 11H11.4c.59 0 .59.41.59 1 0 .59 0 1-.59 1H.59C0 13 0 12.59 0 12c0-.59 0-1 .59-1z"/></svg>
-    </button>
-
-    <div class="site-header-menu">
-      <nav class="site-header-nav site-header-nav-main">
-        <a href="/personal" class="js-selected-navigation-item nav-item nav-item-personal" data-ga-click="Header, click, Nav menu - item:personal" data-selected-links="/personal /personal">
-          Personal
-</a>        <a href="/open-source" class="js-selected-navigation-item nav-item nav-item-opensource" data-ga-click="Header, click, Nav menu - item:opensource" data-selected-links="/open-source /open-source/stories /open-source">
-          Open source
-</a>        <a href="/business" class="js-selected-navigation-item nav-item nav-item-business" data-ga-click="Header, click, Nav menu - item:business" data-selected-links="/business /business/partners /business/features /business/customers /business/why-github-for-work /business/security /business">
-          Business
-</a>        <a href="/explore" class="js-selected-navigation-item nav-item nav-item-explore" data-ga-click="Header, click, Nav menu - item:explore" data-selected-links="/explore /trending /trending/developers /integrations /integrations/feature/code /integrations/feature/collaborate /integrations/feature/ship /showcases /explore">
-          Explore
-</a>      </nav>
-
-      <div class="site-header-actions">
-            <a class="btn btn-primary site-header-actions-btn" href="/join?source=header-repo" data-ga-click="(Logged out) Header, clicked Sign up, text:sign-up">Sign up</a>
-          <a class="btn site-header-actions-btn mr-1" href="/login?return_to=%2Facegiak%2Fmoodkind%2Fblob%2Fmaster%2Fsvg%2Fmood.svg" data-ga-click="(Logged out) Header, clicked Sign in, text:sign-in">Sign in</a>
-      </div>
-
-        <nav class="site-header-nav site-header-nav-secondary mr-md-3">
-          <a class="nav-item" href="/pricing">Pricing</a>
-          <a class="nav-item" href="/blog">Blog</a>
-          <a class="nav-item" href="https://help.github.com">Support</a>
-          <a class="nav-item header-search-link" href="https://github.com/search">Search GitHub</a>
-              <div class="header-search scoped-search site-scoped-search js-site-search" role="search">
-  <!-- '"` --><!-- </textarea></xmp> --></option></form><form accept-charset="UTF-8" action="/acegiak/moodkind/search" class="js-site-search-form" data-scoped-search-url="/acegiak/moodkind/search" data-unscoped-search-url="/search" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>
-    <label class="form-control header-search-wrapper js-chromeless-input-container">
-      <div class="header-search-scope">This repository</div>
-      <input type="text"
-        class="form-control header-search-input js-site-search-focus js-site-search-field is-clearable"
-        data-hotkey="s"
-        name="q"
-        placeholder="Search"
-        aria-label="Search this repository"
-        data-unscoped-placeholder="Search GitHub"
-        data-scoped-placeholder="Search"
-        autocapitalize="off">
-    </label>
-</form></div>
-
-        </nav>
-    </div>
-  </div>
-</header>
-
-
-
-    <div id="start-of-content" class="accessibility-aid"></div>
-
-      <div id="js-flash-container">
-</div>
-
-
-    <div role="main">
-        <div itemscope itemtype="http://schema.org/SoftwareSourceCode">
-    <div id="js-repo-pjax-container" data-pjax-container>
-      
-<div class="pagehead repohead instapaper_ignore readability-menu experiment-repo-nav">
-  <div class="container repohead-details-container">
-
-    
-
-<ul class="pagehead-actions">
-
-  <li>
-      <a href="/login?return_to=%2Facegiak%2Fmoodkind"
-    class="btn btn-sm btn-with-count tooltipped tooltipped-n"
-    aria-label="You must be signed in to watch a repository" rel="nofollow">
-    <svg aria-hidden="true" class="octicon octicon-eye" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
-    Watch
-  </a>
-  <a class="social-count" href="/acegiak/moodkind/watchers"
-     aria-label="2 users are watching this repository">
-    2
-  </a>
-
-  </li>
-
-  <li>
-      <a href="/login?return_to=%2Facegiak%2Fmoodkind"
-    class="btn btn-sm btn-with-count tooltipped tooltipped-n"
-    aria-label="You must be signed in to star a repository" rel="nofollow">
-    <svg aria-hidden="true" class="octicon octicon-star" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74z"/></svg>
-    Star
-  </a>
-
-    <a class="social-count js-social-count" href="/acegiak/moodkind/stargazers"
-      aria-label="2 users starred this repository">
-      2
-    </a>
-
-  </li>
-
-  <li>
-      <a href="/login?return_to=%2Facegiak%2Fmoodkind"
-        class="btn btn-sm btn-with-count tooltipped tooltipped-n"
-        aria-label="You must be signed in to fork a repository" rel="nofollow">
-        <svg aria-hidden="true" class="octicon octicon-repo-forked" height="16" version="1.1" viewBox="0 0 10 16" width="10"><path fill-rule="evenodd" d="M8 1a1.993 1.993 0 0 0-1 3.72V6L5 8 3 6V4.72A1.993 1.993 0 0 0 2 1a1.993 1.993 0 0 0-1 3.72V6.5l3 3v1.78A1.993 1.993 0 0 0 5 15a1.993 1.993 0 0 0 1-3.72V9.5l3-3V4.72A1.993 1.993 0 0 0 8 1zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3 10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm3-10c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
-        Fork
-      </a>
-
-    <a href="/acegiak/moodkind/network" class="social-count"
-       aria-label="0 users forked this repository">
-      0
-    </a>
-  </li>
-</ul>
-
-    <h1 class="public ">
-  <svg aria-hidden="true" class="octicon octicon-repo" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M4 9H3V8h1v1zm0-3H3v1h1V6zm0-2H3v1h1V4zm0-2H3v1h1V2zm8-1v12c0 .55-.45 1-1 1H6v2l-1.5-1.5L3 16v-2H1c-.55 0-1-.45-1-1V1c0-.55.45-1 1-1h10c.55 0 1 .45 1 1zm-1 10H1v2h2v-1h3v1h5v-2zm0-10H2v9h9V1z"/></svg>
-  <span class="author" itemprop="author"><a href="/acegiak" class="url fn" rel="author">acegiak</a></span><!--
---><span class="path-divider">/</span><!--
---><strong itemprop="name"><a href="/acegiak/moodkind" data-pjax="#js-repo-pjax-container">moodkind</a></strong>
-
-</h1>
-
-  </div>
-  <div class="container">
-    
-<nav class="reponav js-repo-nav js-sidenav-container-pjax"
-     itemscope
-     itemtype="http://schema.org/BreadcrumbList"
-     role="navigation"
-     data-pjax="#js-repo-pjax-container">
-
-  <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
-    <a href="/acegiak/moodkind" class="js-selected-navigation-item selected reponav-item" data-hotkey="g c" data-selected-links="repo_source repo_downloads repo_commits repo_releases repo_tags repo_branches /acegiak/moodkind" itemprop="url">
-      <svg aria-hidden="true" class="octicon octicon-code" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg>
-      <span itemprop="name">Code</span>
-      <meta itemprop="position" content="1">
-</a>  </span>
-
-    <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
-      <a href="/acegiak/moodkind/issues" class="js-selected-navigation-item reponav-item" data-hotkey="g i" data-selected-links="repo_issues repo_labels repo_milestones /acegiak/moodkind/issues" itemprop="url">
-        <svg aria-hidden="true" class="octicon octicon-issue-opened" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"/></svg>
-        <span itemprop="name">Issues</span>
-        <span class="counter">0</span>
-        <meta itemprop="position" content="2">
-</a>    </span>
-
-  <span itemscope itemtype="http://schema.org/ListItem" itemprop="itemListElement">
-    <a href="/acegiak/moodkind/pulls" class="js-selected-navigation-item reponav-item" data-hotkey="g p" data-selected-links="repo_pulls /acegiak/moodkind/pulls" itemprop="url">
-      <svg aria-hidden="true" class="octicon octicon-git-pull-request" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>
-      <span itemprop="name">Pull requests</span>
-      <span class="counter">0</span>
-      <meta itemprop="position" content="3">
-</a>  </span>
-
-  <a href="/acegiak/moodkind/projects" class="js-selected-navigation-item reponav-item" data-selected-links="repo_projects new_repo_project repo_project /acegiak/moodkind/projects">
-    <svg aria-hidden="true" class="octicon octicon-project" height="16" version="1.1" viewBox="0 0 15 16" width="15"><path fill-rule="evenodd" d="M10 12h3V2h-3v10zm-4-2h3V2H6v8zm-4 4h3V2H2v12zm-1 1h13V1H1v14zM14 0H1a1 1 0 0 0-1 1v14a1 1 0 0 0 1 1h13a1 1 0 0 0 1-1V1a1 1 0 0 0-1-1z"/></svg>
-    Projects
-    <span class="counter">0</span>
-</a>
-
-
-  <a href="/acegiak/moodkind/pulse" class="js-selected-navigation-item reponav-item" data-selected-links="pulse /acegiak/moodkind/pulse">
-    <svg aria-hidden="true" class="octicon octicon-pulse" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M11.5 8L8.8 5.4 6.6 8.5 5.5 1.6 2.38 8H0v2h3.6l.9-1.8.9 5.4L9 8.5l1.6 1.5H14V8z"/></svg>
-    Pulse
-</a>
-  <a href="/acegiak/moodkind/graphs" class="js-selected-navigation-item reponav-item" data-selected-links="repo_graphs repo_contributors /acegiak/moodkind/graphs">
-    <svg aria-hidden="true" class="octicon octicon-graph" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M16 14v1H0V0h1v14h15zM5 13H3V8h2v5zm4 0H7V3h2v10zm4 0h-2V6h2v7z"/></svg>
-    Graphs
-</a>
-
-</nav>
-
-  </div>
-</div>
-
-<div class="container new-discussion-timeline experiment-repo-nav">
-  <div class="repository-content">
-
-    
-
-<a href="/acegiak/moodkind/blob/23894480f3b365e118e0ae9a83415e38030a8044/svg/mood.svg" class="d-none js-permalink-shortcut" data-hotkey="y">Permalink</a>
-
-<!-- blob contrib key: blob_contributors:v21:7ea29bbd3f624b7ca4a7b5844ef59e00 -->
-
-<div class="file-navigation js-zeroclipboard-container">
-  
-<div class="select-menu branch-select-menu js-menu-container js-select-menu float-left">
-  <button class="btn btn-sm select-menu-button js-menu-target css-truncate" data-hotkey="w"
-    
-    type="button" aria-label="Switch branches or tags" tabindex="0" aria-haspopup="true">
-    <i>Branch:</i>
-    <span class="js-select-button css-truncate-target">master</span>
-  </button>
-
-  <div class="select-menu-modal-holder js-menu-content js-navigation-container" data-pjax aria-hidden="true">
-
-    <div class="select-menu-modal">
-      <div class="select-menu-header">
-        <svg aria-label="Close" class="octicon octicon-x js-menu-close" height="16" role="img" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
-        <span class="select-menu-title">Switch branches/tags</span>
-      </div>
-
-      <div class="select-menu-filters">
-        <div class="select-menu-text-filter">
-          <input type="text" aria-label="Filter branches/tags" id="context-commitish-filter-field" class="form-control js-filterable-field js-navigation-enable" placeholder="Filter branches/tags">
-        </div>
-        <div class="select-menu-tabs">
-          <ul>
-            <li class="select-menu-tab">
-              <a href="#" data-tab-filter="branches" data-filter-placeholder="Filter branches/tags" class="js-select-menu-tab" role="tab">Branches</a>
-            </li>
-            <li class="select-menu-tab">
-              <a href="#" data-tab-filter="tags" data-filter-placeholder="Find a tag…" class="js-select-menu-tab" role="tab">Tags</a>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-      <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="branches" role="menu">
-
-        <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring">
-
-
-            <a class="select-menu-item js-navigation-item js-navigation-open selected"
-               href="/acegiak/moodkind/blob/master/svg/mood.svg"
-               data-name="master"
-               data-skip-pjax="true"
-               rel="nofollow">
-              <svg aria-hidden="true" class="octicon octicon-check select-menu-item-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"/></svg>
-              <span class="select-menu-item-text css-truncate-target js-select-menu-filter-text">
-                master
-              </span>
-            </a>
-        </div>
-
-          <div class="select-menu-no-results">Nothing to show</div>
-      </div>
-
-      <div class="select-menu-list select-menu-tab-bucket js-select-menu-tab-bucket" data-tab-filter="tags">
-        <div data-filterable-for="context-commitish-filter-field" data-filterable-type="substring">
-
-
-        </div>
-
-        <div class="select-menu-no-results">Nothing to show</div>
-      </div>
-
-    </div>
-  </div>
-</div>
-
-  <div class="BtnGroup float-right">
-    <a href="/acegiak/moodkind/find/master"
-          class="js-pjax-capture-input btn btn-sm BtnGroup-item"
-          data-pjax
-          data-hotkey="t">
-      Find file
-    </a>
-    <button aria-label="Copy file path to clipboard" class="js-zeroclipboard btn btn-sm BtnGroup-item tooltipped tooltipped-s" data-copied-hint="Copied!" type="button">Copy path</button>
-  </div>
-  <div class="breadcrumb js-zeroclipboard-target">
-    <span class="repo-root js-repo-root"><span class="js-path-segment"><a href="/acegiak/moodkind"><span>moodkind</span></a></span></span><span class="separator">/</span><span class="js-path-segment"><a href="/acegiak/moodkind/tree/master/svg"><span>svg</span></a></span><span class="separator">/</span><strong class="final-path">mood.svg</strong>
-  </div>
-</div>
-
-
-  <div class="commit-tease">
-      <span class="float-right">
-        <a class="commit-tease-sha" href="/acegiak/moodkind/commit/23894480f3b365e118e0ae9a83415e38030a8044" data-pjax>
-          2389448
-        </a>
-        <relative-time datetime="2016-03-18T13:16:02Z">Mar 18, 2016</relative-time>
-      </span>
-      <div>
-        <img alt="@acegiak" class="avatar" height="20" src="https://avatars1.githubusercontent.com/u/698430?v=3&amp;s=40" width="20" />
-        <a href="/acegiak" class="user-mention" rel="author">acegiak</a>
-          <a href="/acegiak/moodkind/commit/23894480f3b365e118e0ae9a83415e38030a8044" class="message" data-pjax="true" title="initial commit of plugin. As of yet no mood value input interface">initial commit of plugin. As of yet no mood value input interface</a>
-      </div>
-
-    <div class="commit-tease-contributors">
-      <button type="button" class="btn-link muted-link contributors-toggle" data-facebox="#blob_contributors_box">
-        <strong>1</strong>
-         contributor
-      </button>
-      
-    </div>
-
-    <div id="blob_contributors_box" style="display:none">
-      <h2 class="facebox-header" data-facebox-id="facebox-header">Users who have contributed to this file</h2>
-      <ul class="facebox-user-list" data-facebox-id="facebox-description">
-          <li class="facebox-user-list-item">
-            <img alt="@acegiak" height="24" src="https://avatars3.githubusercontent.com/u/698430?v=3&amp;s=48" width="24" />
-            <a href="/acegiak">acegiak</a>
-          </li>
-      </ul>
-    </div>
-  </div>
-
-
-<div class="file">
-  <div class="file-header">
-  <div class="file-actions">
-      <div class="BtnGroup">
-        <a class="btn btn-sm BtnGroup-item tooltipped tooltipped tooltipped-n source "
-          href="/acegiak/moodkind/blob/master/svg/mood.svg?short_path=68a8862" aria-label="Display the source blob">
-          <svg aria-hidden="true" class="octicon octicon-code" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg>
-        </a>
-        <a class="btn btn-sm BtnGroup-item tooltipped tooltipped-n rendered selected"
-          href="/acegiak/moodkind/blob/master/svg/mood.svg" aria-label="Display the rendered blob">
-          <svg aria-hidden="true" class="octicon octicon-file-text" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path d="M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z"/></svg>
-        </a>
-      </div>
-
-    <div class="BtnGroup">
-      <a href="/acegiak/moodkind/raw/master/svg/mood.svg" class="btn btn-sm BtnGroup-item" id="raw-url">Raw</a>
-        <a href="/acegiak/moodkind/blame/master/svg/mood.svg" class="btn btn-sm js-update-url-with-hash BtnGroup-item" data-hotkey="b">Blame</a>
-      <a href="/acegiak/moodkind/commits/master/svg/mood.svg" class="btn btn-sm BtnGroup-item" rel="nofollow">History</a>
-    </div>
-
-
-        <button type="button" class="btn-octicon disabled tooltipped tooltipped-nw"
-          aria-label="You must be signed in to make or propose changes">
-          <svg aria-hidden="true" class="octicon octicon-pencil" height="16" version="1.1" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M0 12v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3L12 6 9 3l1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"/></svg>
-        </button>
-        <button type="button" class="btn-octicon btn-octicon-danger disabled tooltipped tooltipped-nw"
-          aria-label="You must be signed in to make or propose changes">
-          <svg aria-hidden="true" class="octicon octicon-trashcan" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M11 2H9c0-.55-.45-1-1-1H5c-.55 0-1 .45-1 1H2c-.55 0-1 .45-1 1v1c0 .55.45 1 1 1v9c0 .55.45 1 1 1h7c.55 0 1-.45 1-1V5c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 12H3V5h1v8h1V5h1v8h1V5h1v8h1V5h1v9zm1-10H2V3h9v1z"/></svg>
-        </button>
-  </div>
-
-  <div class="file-info">
-      73 lines (72 sloc)
-      <span class="file-info-divider"></span>
-    7.65 KB
-  </div>
-</div>
-
-  
-
-  <div itemprop="text" class="blob-wrapper data type-svg">
-      
-  <div class="render-wrapper">
-    <div class="render-container is-render-pending js-render-target "
-      data-identity="23eeb6c6-ad3d-49af-9bca-c7e8f37c81fb"
-      data-host="https://render.githubusercontent.com"
-      data-type="svg">
-      <img alt="" class="octospinner" height="64" src="https://assets-cdn.github.com/images/spinners/octocat-spinner-128.gif" width="64" />
-      <div class="render-viewer-error">Sorry, something went wrong. <a href="https://github.com/acegiak/moodkind/blob/master/svg/mood.svg">Reload?</a></div>
-      <div class="render-viewer-fatal">Sorry, we cannot display this file.</div>
-      <div class="render-viewer-invalid">Sorry, this file is invalid so it cannot be displayed.</div>
-      <iframe class="render-viewer" src="https://render.githubusercontent.com/view/svg?commit=23894480f3b365e118e0ae9a83415e38030a8044&amp;enc_url=68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f6163656769616b2f6d6f6f646b696e642f323338393434383066336233363565313138653061653961383334313565333830333061383034342f7376672f6d6f6f642e737667&amp;nwo=acegiak%2Fmoodkind&amp;path=svg%2Fmood.svg&amp;repository_id=54202219#23eeb6c6-ad3d-49af-9bca-c7e8f37c81fb" sandbox="allow-scripts allow-same-origin allow-top-navigation">Viewer requires iframe.</iframe>
-    </div>
-  </div>
-
-  </div>
-
-</div>
-
-<button type="button" data-facebox="#jump-to-line" data-facebox-class="linejump" data-hotkey="l" class="d-none">Jump to Line</button>
-<div id="jump-to-line" style="display:none">
-  <!-- '"` --><!-- </textarea></xmp> --></option></form><form accept-charset="UTF-8" action="" class="js-jump-to-line-form" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>
-    <input class="form-control linejump-input js-jump-to-line-field" type="text" placeholder="Jump to line&hellip;" aria-label="Jump to line" autofocus>
-    <button type="submit" class="btn">Go</button>
-</form></div>
-
-  </div>
-  <div class="modal-backdrop js-touch-events"></div>
-</div>
-
-
-    </div>
-  </div>
-
-    </div>
-
-        <div class="container site-footer-container">
-  <div class="site-footer" role="contentinfo">
-    <ul class="site-footer-links float-right">
-        <li><a href="https://github.com/contact" data-ga-click="Footer, go to contact, text:contact">Contact GitHub</a></li>
-      <li><a href="https://developer.github.com" data-ga-click="Footer, go to api, text:api">API</a></li>
-      <li><a href="https://training.github.com" data-ga-click="Footer, go to training, text:training">Training</a></li>
-      <li><a href="https://shop.github.com" data-ga-click="Footer, go to shop, text:shop">Shop</a></li>
-        <li><a href="https://github.com/blog" data-ga-click="Footer, go to blog, text:blog">Blog</a></li>
-        <li><a href="https://github.com/about" data-ga-click="Footer, go to about, text:about">About</a></li>
-
-    </ul>
-
-    <a href="https://github.com" aria-label="Homepage" class="site-footer-mark" title="GitHub">
-      <svg aria-hidden="true" class="octicon octicon-mark-github" height="24" version="1.1" viewBox="0 0 16 16" width="24"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"/></svg>
-</a>
-    <ul class="site-footer-links">
-      <li>&copy; 2017 <span title="0.05096s from github-fe-0b0ad8d.cp1-iad.github.net">GitHub</span>, Inc.</li>
-        <li><a href="https://github.com/site/terms" data-ga-click="Footer, go to terms, text:terms">Terms</a></li>
-        <li><a href="https://github.com/site/privacy" data-ga-click="Footer, go to privacy, text:privacy">Privacy</a></li>
-        <li><a href="https://github.com/security" data-ga-click="Footer, go to security, text:security">Security</a></li>
-        <li><a href="https://status.github.com/" data-ga-click="Footer, go to status, text:status">Status</a></li>
-        <li><a href="https://help.github.com" data-ga-click="Footer, go to help, text:help">Help</a></li>
-    </ul>
-  </div>
-</div>
-
-
-
-    
-
-    <div id="ajax-error-message" class="ajax-error-message flash flash-error">
-      <svg aria-hidden="true" class="octicon octicon-alert" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.865 1.52c-.18-.31-.51-.5-.87-.5s-.69.19-.87.5L.275 13.5c-.18.31-.18.69 0 1 .19.31.52.5.87.5h13.7c.36 0 .69-.19.86-.5.17-.31.18-.69.01-1L8.865 1.52zM8.995 13h-2v-2h2v2zm0-3h-2V6h2v4z"/></svg>
-      <button type="button" class="flash-close js-flash-close js-ajax-error-dismiss" aria-label="Dismiss error">
-        <svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
-      </button>
-      You can't perform that action at this time.
-    </div>
-
-
-      <script crossorigin="anonymous" src="https://assets-cdn.github.com/assets/compat-8e19569aacd39e737a14c8515582825f3c90d1794c0e5539f9b525b8eb8b5a8e.js"></script>
-      <script crossorigin="anonymous" src="https://assets-cdn.github.com/assets/frameworks-a631ecd079e91d27e8c4826bced857c2e359148f6e4139c2485ee4eaf6e8b493.js"></script>
-      <script async="async" crossorigin="anonymous" src="https://assets-cdn.github.com/assets/github-e34181e8d9bc6f988dd7ed883775106306f940b87ad55ff9dee30c7014b3d596.js"></script>
-      
-      
-      
-      
-    <div class="js-stale-session-flash stale-session-flash flash flash-warn flash-banner d-none">
-      <svg aria-hidden="true" class="octicon octicon-alert" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M8.865 1.52c-.18-.31-.51-.5-.87-.5s-.69.19-.87.5L.275 13.5c-.18.31-.18.69 0 1 .19.31.52.5.87.5h13.7c.36 0 .69-.19.86-.5.17-.31.18-.69.01-1L8.865 1.52zM8.995 13h-2v-2h2v2zm0-3h-2V6h2v4z"/></svg>
-      <span class="signed-in-tab-flash">You signed in with another tab or window. <a href="">Reload</a> to refresh your session.</span>
-      <span class="signed-out-tab-flash">You signed out in another tab or window. <a href="">Reload</a> to refresh your session.</span>
-    </div>
-    <div class="facebox" id="facebox" style="display:none;">
-  <div class="facebox-popup">
-    <div class="facebox-content" role="dialog" aria-labelledby="facebox-header" aria-describedby="facebox-description">
-    </div>
-    <button type="button" class="facebox-close js-facebox-close" aria-label="Close modal">
-      <svg aria-hidden="true" class="octicon octicon-x" height="16" version="1.1" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M7.48 8l3.75 3.75-1.48 1.48L6 9.48l-3.75 3.75-1.48-1.48L4.52 8 .77 4.25l1.48-1.48L6 6.52l3.75-3.75 1.48 1.48z"/></svg>
-    </button>
-  </div>
-</div>
-
-  </body>
-</html>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   fill="#000000"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   id="svg2"
+   version="1.1">
+
+    <path
+       d="M 11.60448,2.4538269 C 10.759228,2.6291641 10.184968,3.0505958 9.8099323,3.4459747 9.4348963,3.8413536 9.1780054,4.2222913 8.8258253,4.5243963 8.3554475,4.9278928 7.8057172,5.2298672 7.2628318,5.6243863 6.7199464,6.0189054 6.2077578,6.5262279 5.9603372,7.2420187 5.7414856,7.8751588 5.9488504,8.4415059 6.2208361,8.8812195 c 0.2719857,0.4397136 0.5775404,0.8079367 0.7525525,1.1862635 0.2337489,0.5053 0.3049917,1.005324 0.4920535,1.552927 0.1870617,0.547603 0.5074902,1.143204 1.2156616,1.66077 0.6264004,0.457802 1.4080253,0.602718 2.0550473,0.647052 0.647021,0.04434 1.209467,0.03162 1.736659,0.107843 0.704127,0.101803 1.3251,0.299853 2.055047,0.452937 0.729947,0.153084 1.591509,0.241363 2.547101,0.04314 0.845252,-0.175338 1.419512,-0.59677 1.794548,-0.992148 0.375036,-0.395379 0.631927,-0.776317 0.984107,-1.078422 0.470378,-0.403496 1.020108,-0.705471 1.562993,-1.09999 C 21.959491,10.96707 22.47168,10.459747 22.719101,9.7439567 22.937952,9.1108166 22.730588,8.5444695 22.458602,8.104756 22.186616,7.6650424 21.881061,7.2968192 21.706049,6.9184922 21.472301,6.4131923 21.401058,5.9131681 21.213996,5.3655651 21.026934,4.8179622 20.706506,4.2223607 19.998334,3.7047959 19.371934,3.2469931 18.590309,3.1020777 17.943287,3.057743 17.296266,3.0134083 16.73382,3.0261228 16.206628,2.9499008 15.502501,2.8480975 14.881528,2.6500476 14.151581,2.4969637 13.421634,2.3438799 12.560072,2.2556009 11.60448,2.4538269 z" />
+<path  d="m 11.66545,15.517255 c -0.316994,-0.06175 -0.601266,-0.02433 -0.837785,0.03847 -0.236519,0.0628 -0.431149,0.138381 -0.638312,0.192334 -0.152906,0.03982 -0.3186888,0.06222 -0.5266071,0.1154 -0.2079183,0.05318 -0.4598073,0.164451 -0.6542697,0.376974 -0.179355,0.196012 -0.260855,0.40124 -0.3271349,0.60008 -0.012787,0.03836 -0.053828,0.07838 -0.063831,0.1154 -0.061854,0.228901 -0.088498,0.43089 -0.1436202,0.630854 -0.040686,0.147593 -0.1113664,0.299856 -0.1675568,0.500067 -0.05619,0.20021 -0.077693,0.462223 0.015958,0.730867 0.1030381,0.295573 0.2801322,0.518606 0.4547972,0.684707 0.174665,0.1661 0.3426513,0.292509 0.4946917,0.43852 0.112221,0.10777 0.2073227,0.237641 0.3590505,0.384667 0.1517278,0.147026 0.3821143,0.305466 0.6702273,0.361587 0.316994,0.06175 0.601265,0.02433 0.837784,-0.03847 0.236519,-0.0628 0.431149,-0.146074 0.638312,-0.200027 0.152907,-0.03982 0.318689,-0.05452 0.526607,-0.107706 0.207919,-0.05318 0.459808,-0.164451 0.65427,-0.376974 0.213956,-0.233826 0.329112,-0.494273 0.390966,-0.723174 0.06185,-0.228901 0.0885,-0.423196 0.14362,-0.62316 0.04069,-0.147593 0.111367,-0.299857 0.167557,-0.500067 0.05619,-0.20021 0.07769,-0.469917 -0.01596,-0.73856 -0.103039,-0.295573 -0.280133,-0.510914 -0.454798,-0.677014 -0.151222,-0.143807 -0.29593,-0.255218 -0.43086,-0.376974 l -0.06383,-0.06155 C 12.582507,16.155738 12.487405,16.025868 12.335677,15.878842 12.183949,15.731816 11.953562,15.573376 11.66545,15.517255 z" />
+<path d="m 5.6312267,19.238975 c -0.1033199,0.0057 -0.2020645,0.01845 -0.28422,0.03656 -0.164311,0.03621 -0.2812474,0.07974 -0.4009532,0.105616 -0.082497,0.01783 -0.1908991,0.0252 -0.3400489,0.05687 -0.1491498,0.03167 -0.3447377,0.105795 -0.4923097,0.239668 -0.1057417,0.09593 -0.1693515,0.197237 -0.2182403,0.296538 -0.022827,0.04637 -0.052302,0.09204 -0.06598,0.134051 -0.04297,0.131998 -0.059505,0.237185 -0.091356,0.333098 -0.021951,0.0661 -0.061199,0.144824 -0.1015071,0.26404 -0.040308,0.119217 -0.065993,0.293862 0.00508,0.463087 0.074701,0.177874 0.2085575,0.314495 0.3298982,0.410278 0.1213407,0.09578 0.226818,0.157448 0.3146722,0.227482 0.060546,0.04826 0.1246248,0.119623 0.2334664,0.20717 0.1088417,0.08755 0.2838199,0.188067 0.5024604,0.223419 0.2298156,0.03716 0.4498072,0.0159 0.6141182,-0.02031 0.164311,-0.03621 0.2812475,-0.07974 0.4009532,-0.105616 0.082497,-0.01784 0.1908992,-0.0252 0.3400489,-0.05687 0.1491498,-0.03167 0.3447378,-0.105795 0.4923097,-0.239668 0.1551146,-0.140715 0.2412497,-0.302654 0.28422,-0.434652 0.04297,-0.131997 0.05443,-0.233123 0.086281,-0.329035 0.021951,-0.0661 0.066274,-0.144824 0.1065825,-0.26404 0.040308,-0.119217 0.060918,-0.293863 -0.010151,-0.463087 C 7.2618458,20.145699 7.1330646,20.009078 7.0117239,19.913294 6.8903832,19.817511 6.7849059,19.755847 6.6970517,19.685813 6.6365059,19.637549 6.572427,19.56619 6.4635853,19.478643 6.3547437,19.391095 6.1797654,19.290576 5.961125,19.255224 5.8462172,19.236645 5.7345467,19.233298 5.6312267,19.238975 z" />
+
+</svg>