diff --git a/functions.php b/functions.php
index 7bdb4c2..775f144 100644
--- a/functions.php
+++ b/functions.php
@@ -5,60 +5,65 @@
 function contact_form_7_modules_promo_message() {
 	global $pagenow;
 
-	if(!current_user_can('install_plugins')) { return; }
-
-	$message = (int)get_option('cf7_modules_hide_promo_message');
-
-	if(isset($_REQUEST['hide']) && $_REQUEST['hide'] == 'cf7_modules_promo_message') {
-		$message = 3;
-		update_option('cf7_modules_hide_promo_message', $message);
+	if ( ! current_user_can( 'install_plugins' ) ) {
+		return;
 	}
 
-	if($pagenow == 'admin.php' && isset($_REQUEST['page']) && $_REQUEST['page'] == 'wpcf7' && ($message !== 3 || isset($_REQUEST['show']) && $_REQUEST['show'] == 'cf7_modules_promo_message')) {
-		$message = contact_form_7_modules_get_remote_message();
+	$message = (int) get_option( 'cf7_modules_hide_promo_message' );
 
-		$message = str_replace('{hidelink}', add_query_arg('hide', 'cf7_modules_promo_message'), $message);
-		$message = str_replace('{showlink}', add_query_arg('show', 'cf7_modules_promo_message'), $message);
-		$message = str_replace('{adminurl}', admin_url(), $message);
-		$message = str_replace('{siteurl}', site_url(), $message);
+	if ( isset( $_REQUEST['hide'] ) && $_REQUEST['hide'] === 'cf7_modules_promo_message' ) {
+		$message = 5;
+		update_option( 'cf7_modules_hide_promo_message', $message );
+	}
 
-		echo $message;
+	if ( $pagenow == 'admin.php' && isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wpcf7' && ( $message !== 5 || isset( $_REQUEST['show'] ) && $_REQUEST['show'] == 'cf7_modules_promo_message' ) ) {
+		echo contact_form_7_modules_get_message();
 	}
 }
 
-function contact_form_7_modules_get_remote_message() {
-
-    // The ad is stored locally for 30 days as a transient. See if it exists.
-    $cache = function_exists('get_site_transient') ? get_site_transient('contact_form_7_modules_remote_ad') : get_transient('contact_form_7_modules_remote_ad');
-
-    // If it exists, use that (so we save some request time), unless ?cache is set.
-    if(!empty($cache) && !isset($_REQUEST['cache'])) { return $cache; }
-
-    // Get the advertisement remotely. An encrypted site identifier, the language of the site, and the version of the cf7 plugin will be sent to katz.co
-    $response = wp_remote_post('http://katz.co/ads/', array('timeout' => 45,'body' => array('siteid' => sha1(site_url()), 'language' => get_bloginfo('language'), 'plugin' => 'cf7_modules', 'version' => WPCF7_VERSION)));
-
-    // If it was a successful request, process it.
-    if(!is_wp_error($response) && !empty($response)) {
-
-        // Basically, remove <script>, <iframe> and <object> tags for security reasons
-        $body = strip_tags(trim(rtrim($response['body'])), '<b><strong><em><i><span><u><ul><li><ol><div><attr><cite><a><style><blockquote><q><p><form><br><meta><option><textarea><input><select><pre><code><s><del><small><table><tbody><tr><th><td><tfoot><thead><u><dl><dd><dt><col><colgroup><fieldset><address><button><aside><article><legend><label><source><kbd><tbody><hr><noscript><link><h1><h2><h3><h4><h5><h6><img>');
-
-        // If the result is empty, cache it for 8 hours. Otherwise, cache it for 30 days.
-        $cache_time = empty($response['body']) ? floatval(60*60*8) : floatval(60*60*30);
-
-        if(function_exists('set_site_transient')) {
-            set_site_transient('contact_form_7_modules_remote_ad', $body, $cache_time);
-        } else {
-            set_transient('contact_form_7_modules_remote_ad', $body, $cache_time);
-        }
+/**
+ * Display cross-promo for Contact Form 7 Newsletter plugin
+ * @since 2.0.1
+ * @return mixed|string
+ */
+function contact_form_7_modules_get_message() {
+
+	$message = <<<EOL
+<div class="updated" style="font-size:1.2em">
+	<a href="{{hide_link}}" class="button alignright" style="font-style:normal; margin:.75em 0 .75em .75em;">{{hide_text}}</a>
+	<h2>{{want_to}}</h2>
+	<a href="{{ctct_url}}"><img alt="Constant Contact" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARkAAAApCAMAAAA2w608AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwBQTFRFtsbaGEV8JlOM+89tUXanma7KJk98mq3FiKLDqLnOi6G5GUaA7Lhp+slcUXSgRGaN/ee2/NqOUnOZboyxhqDC/eCh/NR8fZax+9F12+LsGENyUnSd+Mtxt8TWJlOR8LhYQ2qe66AhNF6VQ2eR+spg7Lx3i6LAiqLEHURyg57AvcvdYICpNVyNi6PC8qod9a4b8agd/vTe7KMf5psjb4qpJlGFk6rI+LEa/u7M/eKp/eq+NF+Y/NyV+8xn97Aa/d+dboy0tsXYxdDc6Z4hqLjK5Jkk99us7bVZ/vDTbouuNF2R+cVT1Nzm1d7qUXWk+9Bx1Nzkt8TUYH+ljqG5t8TSYH6eK1B8+sZVNVuFYIGvdZK4YH6g/evD+ujHqLrRpbnRYIGsma7I4ZUlmqzC/evGcIyui6K++LUocYupJlCAnrPN/eStHEV1+Nec6qxN+taN+9aDssPY9sBVfZe5Q2iWGUeE/vLZ/e3JKFKF/ei6/N2bNVuJxtDdx9Db9M+QnK3BjqG3Q2mZF0iIF0eHF0eGF0eFGEN1F0aDF0aBGER5F0V/GEN2GER6F0eEGER4qLrT093pF0V+i6PExdHibo22xdHhF0eIF0aCF0aAUnGVGER3GEV7fZi9ma/MxdHg76YeQ2qggJu/9KwcG0V4GkZ+iqTEUnKWF0Z/09zoqLrSG0V6fZi8fZm9xdDexdHf55wii6K9G0Z709znfZi7GkZ8eZW7/d2Y/NeFe5i8+shZ+sdY7aMf8KcefZe3xdDf+9iMi6G8+bw2qLnQtsXaws/ggZatxNHh/u/Q/NWAqLvT6bBc+stj/NR+8MqS+OXIxtLitMTZw9Dh9+C6VnOU1Nvk8a0rwc7fsMHWb4mnUXWmGEiH+9ub9+TJ/O7Vr8HW/vXgj6fG/N6b4OfvuMTSjKPAxtHe+cBEOVuDOFyJcIyw78B2/ezF9tGPfZWv7agu8c+gVnKT5aJA5qdP561cmq/L+uvW+uzW/NiKUnWj/OOs67Jb+MJUF0iJF0iK///gFBQU3oCw6gAAAQB0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AFP3ByUAAAqDSURBVHja7JoJdJTVFcc/w4QYtAFZGiRkGpOQImSKVALKQCUQRGAMBQwQERo2CwguLIqioiQggjLTWdrGZmKkhCakoRRbCrUsiooL3fe92t2W7gu25B/fvfd73zKZnIRU23PSvHMc37zv3ve/7/fuu28yg9Ha06wGaovWPvjGv175K4weHjaUHw5dd9WTz1wx5eqpS4f1kDGxBLb86YVrR+15nyaD1h4yCkv2ynlrhs/Dh20yw3rItKJ4xab9n1wzfPhDJz5gk0Hr/z0Z/OKSvZ8jMiplbDJv9JBpxUaTzNwT42wy/2hLBv+L4N6526Zjo3OaDJ61yUwjR8N9b4U6Nd/be1dG3hFNBD2e8o6mRWybSWblteM0mfdM+4aTDBD3eFuo1dXgv8YlWO4XzejbrYlIeZ2nxtPBtMjVZO4/c+K+5ctpjy5/XfbJMGOMttjtQtF0esddhkDYa2t60KkM67QMwmiJlicHbk2Dxh8oMoUr0u5XQGJG4+qBVz716c/f/CGbDIKOGFtaDFzYgYh3asdBKQLHpvqdmmF07B8Kh9EpGRUPwqEWTzBZYMCZe8xh+HMnLQb6TRjcz6ivr7/4YiEjT4mMK2FaWvwXBKZGLbCuMxser1Nzwy4DLs2WjsFEvZ3iFzRlUBcN1bUtNMCb889YORPCLffNyn/XF+djrE1moEVGg/EEVS2MBMvjF0SGPDuTM3CdGQ3GH1eaISPa4Qzi0HE2w2/urSo0nrYgcfeso/Ohk2v8a+8e3GuiIvPPy+ttMndpMjAkxggfY/OegDT7AtFD9ogMsrNmCceDBCeEnBUMIT6+3mB7mq2Jmqghh1BbIed7vQHlaOfWxj0T848OkomfN3DZF0wy4w0HGdNLkfGeVy3HOQ1dVKrVRFjBCIfDERmK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" width="281" height="41" style="margin:.75em 0 0;" /></a>
+	<h4 style="margin:.75em 0; font-size:1.2em; font-weight:normal;">{{dont_have}} <a href="{{ctct_url}}">{{try_free}}</a> {{15_days}}</h4>
+	<p>{{description}}</p>
+	<p class="submit"><a href="{{admin_url}}" class="button button-large button-primary thickbox" style="display:inline-block; margin-bottom:1em; font-size:1.2em;" title="{{install_title}}">{{add_support}}</a><strong class="description"> - {{its_easy}}</strong></p>
+	<div class="clear"></div>
+</div>
+EOL;
+
+	$strings = array(
+		'ctct_url'      => 'https://katz.si/4i',
+		'hide_link'     => esc_url_raw( add_query_arg( 'hide', 'cf7_modules_promo_message' ) ),
+		'hide_text'     => esc_html__( 'Hide this message', 'cf7_modules' ),
+		'want_to'       => esc_html__( 'Want to integrate your form with a newsletter?', 'cf7_modules' ),
+		'dont_have'     => esc_html__( 'Don\'t have a Constant Contact account?', 'cf7_modules' ),
+		'try_free'      => esc_html__( 'Try Constant Contact for free', 'cf7_modules' ),
+		'15_days'       => esc_html__( 'for 15 days!', 'cf7_modules' ),
+		'description'   => esc_html__( 'The Contact Form 7 Constant Contact Module makes it super-simple to add your contacts to an email newsletter. Simply sign up for a free trial at Constant Contact, enter your details, and you\'re ready to rock.', 'cf7_modules' ),
+		'add_support'   => esc_html__( 'Add Newsletter Support', 'cf7_modules' ),
+		'install_title' => esc_html__( 'Install Contact Form 7 - Constant Contact Module', 'cf7_modules' ),
+		'its_easy'      => esc_html__( 'It&rsquo;s easy!', 'cf7_modules' ),
+		'admin_url'     => esc_url_raw( admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=contact-form-7-newsletter&amp;TB_iframe=true&amp;width=600&amp;height=800' ) ),
+	);
+
+	foreach ( $strings as $key => $string ) {
+		$message = str_replace( '{{' . $key . '}}', $string, $message );
+	}
 
-        // Print the results.
-        return $body;
-    }
+	return $message;
 }
 
 add_filter( 'wpcf7_cf7com_links', 'contact_form_7_modules_links' );
 
 function contact_form_7_modules_links($links) {
-	return str_replace('</div>', ' - <a href="http://katz.si/gf?con=link" target="_blank" title="Gravity Forms is the best WordPress contact form plugin." style="font-size:1.25em;">Try Gravity Forms</a></div>', $links);
+	return str_replace( '</div>', ' - <a href="http://katz.si/gf?con=link" target="_blank" title="Gravity Forms is the best WordPress contact form plugin." style="font-size:1.25em;">Try Gravity Forms</a></div>', $links );
 }
\ No newline at end of file
diff --git a/hidden.php b/hidden.php
index b5b26fa..1c6b6e7 100644
--- a/hidden.php
+++ b/hidden.php
@@ -4,59 +4,53 @@
 Plugin URI: https://katz.co/contact-form-7-hidden-fields/
 Description: Add hidden fields to the popular Contact Form 7 plugin.
 Author: Katz Web Services, Inc.
-Author URI: http://www.katzwebservices.com
-Version: 2.0
+Author URI: http://www.katz.co
+Version: 2.0.1
 Text Domain: cf7_modules
 Domain Path: languages
+License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 */
 
-/*  Copyright 2015 Katz Web Services, Inc. (email: info at katzwebservices.com)
+add_action( 'plugins_loaded', 'contact_form_7_hidden_fields_load_functions' );
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-add_action('init', 'contact_form_7_hidden_fields_textdomain');
-
-function contact_form_7_hidden_fields_textdomain() {
-	// Load the default language files
-	load_plugin_textdomain( 'cf7_modules', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+function contact_form_7_hidden_fields_load_functions() {
+	if ( ! function_exists( 'contact_form_7_modules_promo_message' ) ) {
+		include_once plugin_dir_path( __FILE__ ) . 'functions.php';
+	}
 }
 
-
 add_action('plugins_loaded', 'contact_form_7_hidden_fields', 11);
 
 function contact_form_7_hidden_fields() {
 	global $pagenow;
-	if( class_exists('WPCF7_Shortcode') ) {
-		wpcf7_add_shortcode( array( 'hidden', 'hidden*' ), 'wpcf7_hidden_shortcode_handler', true );
+	if ( class_exists( 'WPCF7_Shortcode' ) || class_exists('WPCF7_FormTag') ) {
+		if ( function_exists( 'wpcf7_add_form_tag' ) ) {
+			wpcf7_add_form_tag( array( 'hidden', 'hidden*' ), 'wpcf7_hidden_shortcode_handler', true );
+		} else {
+			wpcf7_add_shortcode( array( 'hidden', 'hidden*' ), 'wpcf7_hidden_shortcode_handler', true );
+		}
 	} else {
-		if($pagenow != 'plugins.php') { return; }
-		add_action('admin_notices', 'cfhiddenfieldserror');
-		add_action('admin_enqueue_scripts', 'contact_form_7_hidden_fields_scripts');
-
-		function cfhiddenfieldserror() {
-			$out = '<div class="error" id="messages"><p>';
-			if(file_exists(WP_PLUGIN_DIR.'/contact-form-7/wp-contact-form-7.php')) {
-				$out .= 'The Contact Form 7 is installed, but <strong>you must activate Contact Form 7</strong> below for the Hidden Fields Module to work.';
-			} else {
-				$out .= 'The Contact Form 7 plugin must be installed for the Hidden Fields Module to work. <a href="'.admin_url('plugin-install.php?tab=plugin-information&plugin=contact-form-7&from=plugins&TB_iframe=true&width=600&height=550').'" class="thickbox" title="Contact Form 7">Install Now.</a>';
-			}
-			$out .= '</p></div>';
-			echo $out;
+		if ( $pagenow != 'plugins.php' ) {
+			return;
 		}
+
+		add_action( 'admin_notices', 'contact_form_7_hidden_fields_error' );
+		add_action( 'admin_enqueue_scripts', 'contact_form_7_hidden_fields_scripts' );
+	}
+}
+
+function contact_form_7_hidden_fields_error() {
+	$out = '<div class="error" id="messages"><p>';
+	if ( @ file_exists( WP_PLUGIN_DIR . '/contact-form-7/wp-contact-form-7.php' ) ) {
+		$out .= esc_html__( 'The Contact Form 7 is installed, but you must activate Contact Form 7 below for the Hidden Fields Module to work.', 'cf7_modules' );
+	} else {
+		$out .= esc_html__( 'The Contact Form 7 plugin must be installed for the Hidden Fields Module to work.', 'cf7_modules' );
+		$install_url = esc_url_raw( admin_url( 'plugin-install.php?tab=plugin-information&plugin=contact-form-7&from=plugins&TB_iframe=true&width=600&height=550' ) );
+		$out .= sprintf( ' <a href="%s" class="thickbox" title="Contact Form 7">%s</a>', $install_url, esc_html__( 'Install Now.', 'cf7_modules' ) );
 	}
+	$out .= '</p></div>';
+	echo $out;
 }
 
 function contact_form_7_hidden_fields_scripts() {
@@ -78,11 +72,11 @@ function contact_form_7_hidden_fields_scripts() {
  * @return mixed
  */
 function wpcf7_form_elements_strip_paragraphs_and_brs($form) {
-	return preg_replace_callback('/<p>(<input\stype="hidden"(?:.*?))<\/p>/ism', 'wpcf7_form_elements_strip_paragraphs_and_brs_callback', $form);
+	return preg_replace_callback( '/<p>(<input\stype="hidden"(?:.*?))<\/p>/ism', 'wpcf7_form_elements_strip_paragraphs_and_brs_callback', $form );
 }
 
 function wpcf7_form_elements_strip_paragraphs_and_brs_callback($matches = array()) {
-	return "\n".'<!-- CF7 Modules -->'."\n".'<div style=\'display:none;\'>'.str_replace('<br>', '', str_replace('<br />', '', stripslashes_deep($matches[1]))).'</div>'."\n".'<!-- End CF7 Modules -->'."\n";
+	return "\n" . '<!-- CF7 Modules -->' . "\n" . '<div style=\'display:none;\'>' . str_replace( '<br>', '', str_replace( '<br />', '', stripslashes_deep( $matches[1] ) ) ) . '</div>' . "\n" . '<!-- End CF7 Modules -->' . "\n";
 }
 
 /**
@@ -93,7 +87,11 @@ function wpcf7_form_elements_strip_paragraphs_and_brs_callback($matches = array(
 
 function wpcf7_hidden_shortcode_handler( $tag ) {
 
-	$tag = new WPCF7_Shortcode( $tag );
+	if ( class_exists( 'WPCF7_FormTag' ) ) {
+	    $tag = new WPCF7_FormTag( $tag );
+	} else {
+		$tag = new WPCF7_Shortcode( $tag );
+	}
 
 	if ( empty( $tag->name ) ) {
 		return '';
@@ -126,7 +124,7 @@ function wpcf7_hidden_shortcode_handler( $tag ) {
 	$value = contact_form_7_hidden_fields_fill_post_data( $value, $tag );
 
 	// Post data hasn't filled yet. No arrays.
-	if( $default_value === $value ) {
+	if ( $default_value === $value ) {
 		$value = contact_form_7_hidden_fields_fill_user_data( $value );
 	}
 
@@ -172,8 +170,8 @@ function contact_form_7_hidden_fields_fill_user_data( $value ) {
 
 	// Process user stuff
 	if ( preg_match( '/user/ism', strtolower( trim( $value ) ) ) && is_user_logged_in() ) {
-		global $current_user;
-		get_currentuserinfo();
+
+	    $current_user = wp_get_current_user();
 
 		switch ( $value ) {
 			case 'user_name':
@@ -272,14 +270,6 @@ function contact_form_7_hidden_fields_fill_post_data( $value = '', $tag ) {
 	return $return;
 }
 
-add_filter('wpcf7_hidden_field_value_example', 'wpcf7_hidden_field_add_query_arg');
-function wpcf7_hidden_field_add_query_arg($value = '') {
-	if(isset($_GET['category'])) {
-		return $_GET['category'];
-	}
-	return $value;
-}
-
 
 /* Tag generator */
 
@@ -289,10 +279,10 @@ function wpcf7_hidden_field_add_query_arg($value = '') {
 
 function wpcf7_add_tag_generator_hidden() {
 
-	if( class_exists('WPCF7_TagGenerator') ) {
+	if ( class_exists( 'WPCF7_TagGenerator' ) ) {
 
 		$tag_generator = WPCF7_TagGenerator::get_instance();
-		$tag_generator->add( 'hidden', __( 'hidden', 'cf7_modules' ), 'wpcf7_tg_pane_hidden' );
+		$tag_generator->add( 'hidden', _x( 'hidden', 'the name of the field button in CF7', 'cf7_modules' ), 'wpcf7_tg_pane_hidden' );
 
 	}
 }
@@ -302,71 +292,84 @@ function wpcf7_tg_pane_hidden( $contact_form, $args = '' ) {
 	$args = wp_parse_args( $args, array() );
 
 	$description = __( "Generate a form tag for a hidden field. For more details, see %s.", 'contact-form-7' );
-	$desc_link = wpcf7_link( __( 'https://wordpress.org/plugins/contact-form-7-modules/', 'contact-form-7' ), __( 'the plugin page on WordPress.org', 'contact-form-7' ), array('target' => '_blank' ) );
-?>
-<div class="control-box">
-	<fieldset>
-		<legend><?php printf( esc_html( $description ), $desc_link ); ?></legend>
-
-		<table class="form-table">
-			<tbody>
-				<tr>
-					<th scope="row"><label for="<?php echo esc_attr( $args['content'] . '-name' ); ?>"><?php echo esc_html( __( 'Name', 'contact-form-7' ) ); ?></label></th>
-					<td><input type="text" name="name" class="tg-name oneline" id="<?php echo esc_attr( $args['content'] . '-name' ); ?>" /></td>
-				</tr>
-
-				<tr>
-					<th scope="row"><label for="<?php echo esc_attr( $args['content'] . '-id' ); ?>"><?php echo esc_html( __( 'ID attribute', 'contact-form-7' ) ); ?> (<?php echo esc_html( __( 'optional', 'cf7_modules' ) ); ?>)</label></th>
-					<td><input type="text" name="id" class="idvalue oneline option" id="<?php echo esc_attr( $args['content'] . '-id' ); ?>" /></td>
-				</tr>
-				<tr>
-					<th scope="row">
-						<?php _e('Value', 'cf7_modules'); ?>
-					</th>
-					<td>
-						<input type="text" name="values" class="oneline" />
-						<div>
-							<input type="checkbox" name="watermark" class="option" />&nbsp;<?php echo esc_html( __( 'Use this text as watermark?', 'cf7_modules' ) ); ?>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<th scope="row">
-						<?php _e('Dynamic Values', 'cf7_modules'); ?>
-					</th>
-					<td>
-						<span class="howto" style="font-size:1em;"><?php _e('To use dynamic data from the post or page the form is embedded on, you can use the following values:', 'cf7_modules'); ?></span>
-
-						<ul>
-							<li><?php _e('<code>post_title</code>: The title of the post/page', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>post_url</code>: The URL of the post/page', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>post_category</code>: The categories the post is in, comma-separated', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>post_date</code>: The date the post/page was created', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>post_author</code>: The name of the author of the post/page', 'cf7_modules'); ?></li>
-						</ul>
-						<span class="howto"><?php _e('The following values will be replaced if an user is logged in:', 'cf7_modules'); ?></span>
-						<ul>
-							<li><?php _e('<code>user_name</code>: User Login', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>user_id</code>: User ID', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>user_email</code>: User Email Address', 'cf7_modules'); ?></li>
-							<li><?php _e('<code>user_display_name</code>: Display Name (Generally the first and last name of the user)', 'cf7_modules'); ?></li>
-						</ul>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</fieldset>
-</div>
-	<div class="insert-box">
-		<input type="text" name="hidden" class="tag code" readonly="readonly" onfocus="this.select()" />
-
-		<div class="submitbox">
-			<input type="button" class="button button-primary insert-tag" value="<?php echo esc_attr( __( 'Insert Tag', 'contact-form-7' ) ); ?>" />
-		</div>
-
-		<br class="clear" />
-
-		<p class="description mail-tag"><label for="<?php echo esc_attr( $args['content'] . '-mailtag' ); ?>"><?php echo sprintf( esc_html( __( "To use the value input through this field in a mail field, you need to insert the corresponding mail-tag (%s) into the field on the Mail tab.", 'contact-form-7' ) ), '<strong><span class="mail-tag"></span></strong>' ); ?><input type="text" class="mail-tag code hidden" readonly="readonly" id="<?php echo esc_attr( $args['content'] . '-mailtag' ); ?>" /></label></p>
-	</div>
-<?php
+	$desc_link   = wpcf7_link( 'https://wordpress.org/plugins/contact-form-7-modules/', __( 'the plugin page on WordPress.org', 'contact-form-7' ), array( 'target' => '_blank' ) );
+	?>
+    <div class="control-box">
+        <fieldset>
+            <legend><?php printf( esc_html( $description ), $desc_link ); ?></legend>
+
+            <table class="form-table">
+                <tbody>
+                <tr>
+                    <th scope="row"><label
+                                for="<?php echo esc_attr( $args['content'] . '-name' ); ?>"><?php echo esc_html( __( 'Name', 'contact-form-7' ) ); ?></label>
+                    </th>
+                    <td><input type="text" name="name" class="tg-name oneline"
+                               id="<?php echo esc_attr( $args['content'] . '-name' ); ?>"/></td>
+                </tr>
+
+                <tr>
+                    <th scope="row"><label
+                                for="<?php echo esc_attr( $args['content'] . '-id' ); ?>"><?php echo esc_html( __( 'ID attribute', 'contact-form-7' ) ); ?>
+                            (<?php echo esc_html( __( 'optional', 'cf7_modules' ) ); ?>)</label></th>
+                    <td><input type="text" name="id" class="idvalue oneline option"
+                               id="<?php echo esc_attr( $args['content'] . '-id' ); ?>"/></td>
+                </tr>
+                <tr>
+                    <th scope="row">
+						<?php _e( 'Value', 'cf7_modules' ); ?>
+                    </th>
+                    <td>
+                        <input type="text" name="values" class="oneline"/>
+                        <div>
+                            <input type="checkbox" name="watermark"
+                                   class="option"/>&nbsp;<?php echo esc_html( __( 'Use this text as watermark?', 'cf7_modules' ) ); ?>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">
+						<?php _e( 'Dynamic Values', 'cf7_modules' ); ?>
+                    </th>
+                    <td>
+                        <span class="howto"
+                              style="font-size:1em;"><?php _e( 'To use dynamic data from the post or page the form is embedded on, you can use the following values:', 'cf7_modules' ); ?></span>
+
+                        <ul>
+                            <li><?php _e( '<code>post_title</code>: The title of the post/page', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>post_url</code>: The URL of the post/page', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>post_category</code>: The categories the post is in, comma-separated', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>post_date</code>: The date the post/page was created', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>post_author</code>: The name of the author of the post/page', 'cf7_modules' ); ?></li>
+                        </ul>
+                        <span class="howto"><?php _e( 'The following values will be replaced if an user is logged in:', 'cf7_modules' ); ?></span>
+                        <ul>
+                            <li><?php _e( '<code>user_name</code>: User Login', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>user_id</code>: User ID', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>user_email</code>: User Email Address', 'cf7_modules' ); ?></li>
+                            <li><?php _e( '<code>user_display_name</code>: Display Name (Generally the first and last name of the user)', 'cf7_modules' ); ?></li>
+                        </ul>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </fieldset>
+    </div>
+
+    <div class="insert-box">
+        <input type="text" name="hidden" class="tag code" readonly="readonly" onfocus="this.select()"/>
+
+        <div class="submitbox">
+            <input type="button" class="button button-primary insert-tag"
+                   value="<?php echo esc_attr( __( 'Insert Tag', 'contact-form-7' ) ); ?>"/>
+        </div>
+
+        <br class="clear"/>
+
+        <p class="description mail-tag"><label
+                    for="<?php echo esc_attr( $args['content'] . '-mailtag' ); ?>"><?php echo sprintf( esc_html( __( "To use the value input through this field in a mail field, you need to insert the corresponding mail-tag (%s) into the field on the Mail tab.", 'contact-form-7' ) ), '<strong><span class="mail-tag"></span></strong>' ); ?>
+                <input type="text" class="mail-tag code hidden" readonly="readonly"
+                       id="<?php echo esc_attr( $args['content'] . '-mailtag' ); ?>"/></label></p>
+    </div>
+	<?php
 }
diff --git a/languages/en_US.mo b/languages/en_US.mo
index 7d6740a..2fe35db 100644
Binary files a/languages/en_US.mo and b/languages/en_US.mo differ
diff --git a/languages/en_US.po b/languages/en_US.po
index 4f4cb32..d68e926 100644
--- a/languages/en_US.po
+++ b/languages/en_US.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Contact Form 7 Modules: Send All Fields\n"
-"POT-Creation-Date: 2014-03-15 17:07-0700\n"
-"PO-Revision-Date: 2014-03-15 17:07-0700\n"
-"Last-Translator: Zack Katz <support@katz.co>\n"
+"POT-Creation-Date: 2017-02-01 18:38-0700\n"
+"PO-Revision-Date: 2017-02-01 18:38-0700\n"
+"Last-Translator: Katz Web Services, Inc. <support@katz.co>\n"
 "Language-Team: Zack Katz <support@katz.co>\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
@@ -18,98 +18,155 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: hidden.php:267
-msgid "Hidden field"
+#: functions.php:46
+msgid "Hide this message"
 msgstr ""
 
-#: hidden.php:277
+#: functions.php:47
+msgid "Want to integrate your form with a newsletter?"
+msgstr ""
+
+#: functions.php:48
+msgid "Don't have a Constant Contact account?"
+msgstr ""
+
+#: functions.php:49
+msgid "Try Constant Contact for free"
+msgstr ""
+
+#: functions.php:50
+msgid "for 15 days!"
+msgstr ""
+
+#: functions.php:51
+msgid ""
+"The Contact Form 7 Constant Contact Module makes it super-simple to add your "
+"contacts to an email newsletter. Simply sign up for a free trial at Constant "
+"Contact, enter your details, and you're ready to rock."
+msgstr ""
+
+#: functions.php:52
+msgid "Add Newsletter Support"
+msgstr ""
+
+#: functions.php:53
+msgid "Install Contact Form 7 - Constant Contact Module"
+msgstr ""
+
+#: functions.php:54
+msgid "It&rsquo;s easy!"
+msgstr ""
+
+#: hidden.php:46
+msgid ""
+"The Contact Form 7 is installed, but you must activate Contact Form 7 below "
+"for the Hidden Fields Module to work."
+msgstr ""
+
+#: hidden.php:48
+msgid ""
+"The Contact Form 7 plugin must be installed for the Hidden Fields Module to "
+"work."
+msgstr ""
+
+#: hidden.php:50
+msgid "Install Now."
+msgstr ""
+
+#: hidden.php:285
+msgctxt "the name of the field button in CF7"
+msgid "hidden"
+msgstr ""
+
+#: hidden.php:294
+#, php-format
+msgid "Generate a form tag for a hidden field. For more details, see %s."
+msgstr ""
+
+#: hidden.php:295
+msgid "the plugin page on WordPress.org"
+msgstr ""
+
+#: hidden.php:305
 msgid "Name"
 msgstr ""
 
-#: hidden.php:280 hidden.php:286
+#: hidden.php:313
+msgid "ID attribute"
+msgstr ""
+
+#: hidden.php:314
 msgid "optional"
 msgstr ""
 
-#: hidden.php:286
-msgid "Default value"
+#: hidden.php:320
+msgid "Value"
 msgstr ""
 
-#: hidden.php:287
+#: hidden.php:326
 msgid "Use this text as watermark?"
 msgstr ""
 
-#: hidden.php:292
+#: hidden.php:332
 msgid "Dynamic Values"
 msgstr ""
 
-#: hidden.php:293
+#: hidden.php:336
 msgid ""
 "To use dynamic data from the post or page the form is embedded on, you can "
 "use the following values:"
 msgstr ""
 
-#: hidden.php:295
+#: hidden.php:339
 msgid "<code>post_title</code>: The title of the post/page"
 msgstr ""
 
-#: hidden.php:296
+#: hidden.php:340
 msgid "<code>post_url</code>: The URL of the post/page"
 msgstr ""
 
-#: hidden.php:297
+#: hidden.php:341
 msgid ""
 "<code>post_category</code>: The categories the post is in, comma-separated"
 msgstr ""
 
-#: hidden.php:298
+#: hidden.php:342
 msgid "<code>post_date</code>: The date the post/page was created"
 msgstr ""
 
-#: hidden.php:299
+#: hidden.php:343
 msgid "<code>post_author</code>: The name of the author of the post/page"
 msgstr ""
 
-#: hidden.php:301
+#: hidden.php:345
 msgid "The following values will be replaced if an user is logged in:"
 msgstr ""
 
-#: hidden.php:303
+#: hidden.php:347
 msgid "<code>user_name</code>: User Login"
 msgstr ""
 
-#: hidden.php:304
+#: hidden.php:348
 msgid "<code>user_id</code>: User ID"
 msgstr ""
 
-#: hidden.php:305
+#: hidden.php:349
 msgid "<code>user_email</code>: User Email Address"
 msgstr ""
 
-#: hidden.php:306
+#: hidden.php:350
 msgid ""
 "<code>user_display_name</code>: Display Name (Generally the first and last "
 "name of the user)"
 msgstr ""
 
-#: hidden.php:312
-msgid "Copy this code and paste it into the form left."
+#: hidden.php:364
+msgid "Insert Tag"
 msgstr ""
 
-#: hidden.php:314
-msgid "And, put this code into the Mail fields below."
-msgstr ""
-
-#: send-all-fields.php:110
-msgid "All Fields"
-msgstr ""
-
-#: send-all-fields.php:118
+#: hidden.php:370
 #, php-format
-msgid "Add all fields to your email with %s[all-fields]%s"
-msgstr ""
-
-#: send-all-fields.php:120
 msgid ""
-"Put this code into the Mail fields below to output all submitted fields in "
-"the email."
+"To use the value input through this field in a mail field, you need to "
+"insert the corresponding mail-tag (%s) into the field on the Mail tab."
 msgstr ""
diff --git a/readme.txt b/readme.txt
index 04f0627..aa42619 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,11 @@
 === Contact Form 7 Modules ===
-Tags: Contact Form 7, form, forms, contactform7, contact form, hidden fields, hidden, cf7, cforms ii, cforms, Contact Forms 7, Contact Forms, contacted, contacts
+Tags: Contact Form 7, cf7, Contact Forms 7, hidden fields, all fields
 Requires at least: 2.8
-Tested up to: 4.2.2
+Tested up to: 4.7.2
 Stable tag: trunk
 Contributors: katzwebdesign, katzwebservices
 Donate link: https://katz.co/contact-form-7-hidden-fields/
+License: GPLv2 or later
 
 Contact Form 7 - Add useful modules such as hidden fields and "send all fields" to the Contact Form 7 plugin
 
@@ -12,7 +13,7 @@ Contact Form 7 - Add useful modules such as hidden fields and "send all fields"
 
 ### Add Hidden Fields to Contact Form 7
 
-The Contact Form 7 plugin has over <em>8.4 million</em> downloads, yet the great plugin still lacks a simple feature: <strong>hidden fields</strong>. This plugin adds hidden fields to Contact Form 7 once and for all.
+The Contact Form 7 plugin has over <em>1 million</em> active installations, yet the great plugin still lacks a simple feature: <strong>hidden fields</strong>. This plugin adds hidden fields to Contact Form 7 once and for all.
 
 #### Inserting dynamic values
 
@@ -90,10 +91,6 @@ To get the values of WordPress default profile fields, for example, you would us
 
 * This plugin is released under a GPL license.
 
-= Is the plugin available in other languages? =
-
-Not yet, so [help translate the plugin!](https://www.transifex.com/projects/p/contact-form-7-modules/)
-
 = How do I send empty values with the `[all-fields]` shortcode? =
 
 Add this to your `functions.php` file: `add_filter('wpcf7_send_all_fields_send_empty_fields', '__return_true');`
@@ -114,6 +111,15 @@ Add this to your `functions.php` file: `add_filter('wpcf7_send_all_fields_send_e
 
 == Changelog ==
 
+= 2.0.1 on February 1, 2017 =
+
+* Confirmed compatibility with WordPress 4.7.2
+* Updated to work with Contact Form 7 4.6
+    * Fixed: `[hidden]` shortcodes not being replaced in emails
+    * Fixed: PHP warning related to deprecated function
+* Fixed: Removed use of deprecated `get_currentuserinfo()` function
+* Updated translations
+
 = 2.0 on June 28, 2015 =
 * **Requires Contact Form 7 4.2 or higher**
 * Updated to work with latest Contact Form 7
diff --git a/send-all-fields.php b/send-all-fields.php
index f2d0a2f..3c4adc2 100644
--- a/send-all-fields.php
+++ b/send-all-fields.php
@@ -4,102 +4,104 @@
 Plugin URI: https://katz.co/contact-form-7-hidden-fields/
 Description: Send all submitted fields in the message body using one simple tag: <code>[all-fields]</code>
 Author: Katz Web Services, Inc.
-Author URI: http://www.katzwebservices.com
+Author URI: http://www.katz.co
 Version: 2.0.1
 Text Domain: cf7_modules
 Domain Path: languages
+License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 */
 
-/*  Copyright 2015 Katz Web Services, Inc. (email: info at katzwebservices.com)
+add_action( 'plugins_loaded', 'all_fields_wpcf7_load_functions' );
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-add_action('init', 'contact_form_7_all_fields_textdomain');
-
-function contact_form_7_all_fields_textdomain() {
-	// Load the default language files
-	load_plugin_textdomain( 'cf7_modules', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+function all_fields_wpcf7_load_functions() {
+	if ( ! function_exists( 'contact_form_7_modules_promo_message' ) ) {
+		include_once plugin_dir_path( __FILE__ ) . 'functions.php';
+	}
 }
 
 add_filter('wpcf7_mail_components', 'all_fields_wpcf7_before_send_mail');
 
 function all_fields_wpcf7_before_send_mail($array) {
-	$debug = false;  global $wpdb;
+	$debug = false;
 
-	if($debug) { print_r($array); }
-	if($debug) { print_r($_POST); }
+	if ( $debug ) {
+		print_r( $array );
+	}
+	if ( $debug ) {
+		print_r( $_POST );
+	}
 
 	$post = $_POST;
 
 	$html = false;
-	if(wpautop($array['body']) == $array['body']) { $html = true; }
+	if ( wpautop( $array['body'] ) == $array['body'] ) {
+		$html = true;
+	}
 
-	foreach($post as $k => $v) {
-		if(substr($k, 0, 6) == '_wpcf7' || strpos($k, 'all-fields') || $k === '_wpnonce') {
-			unset($post["{$k}"]);
+	foreach ( $post as $k => $v ) {
+		if ( substr( $k, 0, 6 ) == '_wpcf7' || strpos( $k, 'all-fields' ) || $k === '_wpnonce' ) {
+			unset( $post["{$k}"] );
 		}
 	}
-	if($debug) { print_r($post); }
+	if ( $debug ) {
+		print_r( $post );
+	}
 
 	$postbody = '';
 
-    if($html) {
-    	$postbody = apply_filters( 'wpcf7_send_all_fields_format_before' , '<dl>', 'html');
-    } else {
-    	$postbody = apply_filters( 'wpcf7_send_all_fields_format_before' , '', 'text');
-    }
+	if ( $html ) {
+		$postbody = apply_filters( 'wpcf7_send_all_fields_format_before', '<dl>', 'html' );
+	} else {
+		$postbody = apply_filters( 'wpcf7_send_all_fields_format_before', '', 'text' );
+	}
 
-	foreach($post as $k => $v) {
+	foreach ( $post as $k => $v ) {
 
-        // Remove dupe content. The Hidden and Values are both sent.
-        if(preg_match('/hidden\-/', $k)) { continue; }
+		// Remove dupe content. The Hidden and Values are both sent.
+		if ( preg_match( '/hidden\-/', $k ) ) {
+			continue;
+		}
 
-        // If there's no value for the field, don't send it.
-        if(empty($v) && false === apply_filters( 'wpcf7_send_all_fields_send_empty_fields' , false )) {
-        	continue;
-        }
+		// If there's no value for the field, don't send it.
+		if ( empty( $v ) && false === apply_filters( 'wpcf7_send_all_fields_send_empty_fields', false ) ) {
+			continue;
+		}
 
-        if(is_array($v)) {
-			$v = implode(', ', $v);
+		if ( is_array( $v ) ) {
+			$v = implode( ', ', $v );
 		}
 
-        // Make the fields easier to read. Thanks, @hitolonen
-        $k = apply_filters( 'wpcf7_send_all_fields_format_key', true ) ? ucwords(str_replace("-", " ", str_replace("_", " ", $k))) : $k;
+		// Make the fields easier to read. Thanks, @hitolonen
+		$k = apply_filters( 'wpcf7_send_all_fields_format_key', true ) ? ucwords( str_replace( "-", " ", str_replace( "_", " ", $k ) ) ) : $k;
 
-        // Sanitize!
-        $k = esc_attr($k);
-        $v = esc_attr($v);
+		// Sanitize!
+		$k = esc_attr( $k );
+		$v = esc_attr( $v );
 
-		if($html) {
-			$postbody .= apply_filters( 'wpcf7_send_all_fields_format_item', "<dt style='font-size:1.2em;'><font size='3'><strong style='font-weight:bold;'>{$k}</strong>:</font></dt><dd style='padding:0 0 .5em 1.5em; margin:0;'>{$v}</dd>", $k, $v, 'html');
+		if ( $html ) {
+			$postbody .= apply_filters( 'wpcf7_send_all_fields_format_item', "<dt style='font-size:1.2em;'><font size='3'><strong style='font-weight:bold;'>{$k}</strong>:</font></dt><dd style='padding:0 0 .5em 1.5em; margin:0;'>{$v}</dd>", $k, $v, 'html' );
 		} else {
-			$postbody .= apply_filters( 'wpcf7_send_all_fields_format_item', "{$k}: {$v}\n", $k, $v, 'text');
+			$postbody .= apply_filters( 'wpcf7_send_all_fields_format_item', "{$k}: {$v}\n", $k, $v, 'text' );
 		}
 	}
-	if($html) {
-		$postbody .= apply_filters( 'wpcf7_send_all_fields_format_after' , '</dl>', 'html');
+	if ( $html ) {
+		$postbody .= apply_filters( 'wpcf7_send_all_fields_format_after', '</dl>', 'html' );
 	} else {
-		$postbody .= apply_filters( 'wpcf7_send_all_fields_format_after' , '', 'text');
+		$postbody .= apply_filters( 'wpcf7_send_all_fields_format_after', '', 'text' );
 	}
 
-	if($debug) { print_r($postbody); }
+	if ( $debug ) {
+		print_r( $postbody );
+	}
 
-	$array['body'] = str_replace('<p>[all-fields]</p>', $postbody, str_replace('[all-fields]', $postbody, $array['body']));
+	$array['body'] = str_replace( '<p>[all-fields]</p>', $postbody, str_replace( '[all-fields]', $postbody, $array['body'] ) );
 
-    if($debug) { die(); } else { return $array; }
+	if ( $debug ) {
+		die();
+	} else {
+		return $array;
+	}
 }
 
 add_filter('wpcf7_collect_mail_tags', 'wpcf7_collect_mail_tags_add_all_fields_tag');