diff --git a/inc/enqueue.php b/inc/enqueue.php
index fdf739b3..47d959dd 100644
--- a/inc/enqueue.php
+++ b/inc/enqueue.php
@@ -5,39 +5,27 @@
  * @package understrap
  */
 
-/**
- * @param  string  $filename
- * @return string
- */
-function asset_path($filename) {
-    $manifest_path = get_stylesheet_directory() .'/rev-manifest.json';
-    if ( file_exists($manifest_path ) ) {
-        $manifest = json_decode( file_get_contents( $manifest_path ), TRUE );
-    } else {
-        $manifest = [];
-    }
-    if ( array_key_exists( $filename, $manifest ) ) {
-        return $manifest[$filename];
-    }
-    return $filename;
-}
-
 if ( ! function_exists( 'understrap_scripts' ) ) {
 	/**
 	 * Load theme's JavaScript and CSS sources.
 	 */
 	function understrap_scripts() {
-
-		wp_enqueue_style( 'understrap-styles', get_stylesheet_directory_uri() . '/'. asset_path('css/theme.min.css'), array(), null);
+		// Get the theme data.
+		$the_theme = wp_get_theme();
+		$theme_version = $the_theme->get( 'Version' );
+		
+		$css_version = $theme_version . '.' . filemtime(get_template_directory() . '/css/theme.min.css');
+		wp_enqueue_style( 'understrap-styles', get_stylesheet_directory_uri() . '/css/theme.min.css', array(), $css_version );
 
 		wp_enqueue_script( 'jquery');
-		wp_enqueue_script( 'popper-scripts', get_template_directory_uri() . '/js/popper.min.js', array(), false, true);
-
-		wp_enqueue_script( 'understrap-scripts', get_template_directory_uri() . '/' . asset_path('js/theme.min.js'), array(), null, true );
+		wp_enqueue_script( 'popper-scripts', get_template_directory_uri() . '/js/popper.min.js', array(), $theme_version, true);
+		
+		$js_version = $theme_version . '.' . filemtime(get_template_directory() . '/js/theme.min.js');
+		wp_enqueue_script( 'understrap-scripts', get_template_directory_uri() . '/js/theme.min.js', array(), $js_version, true );
 		if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 			wp_enqueue_script( 'comment-reply' );
 		}
 	}
 } // endif function_exists( 'understrap_scripts' ).
 
-add_action( 'wp_enqueue_scripts', 'understrap_scripts' );
+add_action( 'wp_enqueue_scripts', 'understrap_scripts' );
\ No newline at end of file
diff --git a/inc/woocommerce.php b/inc/woocommerce.php
index 81258c58..e1c800aa 100644
--- a/inc/woocommerce.php
+++ b/inc/woocommerce.php
@@ -5,7 +5,6 @@
  * @package understrap
  */
 
-
 add_action( 'after_setup_theme', 'understrap_woocommerce_support' );
 if ( ! function_exists( 'understrap_woocommerce_support' ) ) {
 	/**
@@ -24,7 +23,6 @@ if ( ! function_exists( 'understrap_woocommerce_support' ) ) {
 	}
 }
 
-
 /**
 * First unhook the WooCommerce wrappers
 */
@@ -135,4 +133,4 @@ if ( ! function_exists ( 'understrap_wc_form_field_args' ) ) {
 		} // end switch ($args).
 		return $args;
 	}
-}
+}
\ No newline at end of file