diff --git a/app/assets/stylesheets/active_scaffold.scss b/app/assets/stylesheets/active_scaffold.scss
index a1f6bbe5b..c13d73080 100644
--- a/app/assets/stylesheets/active_scaffold.scss
+++ b/app/assets/stylesheets/active_scaffold.scss
@@ -5,10 +5,9 @@
  ActiveScaffold is freely distributable under the terms of an MIT-style license.
 
  For details, see the ActiveScaffold web site: https://github.com/activescaffold/active_scaffold
- *= require_self
- *= require "active_scaffold_jquery_ui"
- *= require "active_scaffold_extensions"
 */
+@import 'active_scaffold_jquery_ui';
+@import 'active_scaffold_extensions';
 
 @import 'active_scaffold_layout';
 @import 'active_scaffold_images';
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 85db7bd16..623a59e2c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -151,3 +151,10 @@ en:
   time:
     formats:
       picker: "%a, %d %b %Y %H:%M:%S"
+  datetime:
+    prompts:
+      hour: Hour
+      minute: Minute
+      second: Second
+      millisec: Millisecond
+      microsec: Microsecond
diff --git a/lib/active_scaffold/bridges/date_picker/helper.rb b/lib/active_scaffold/bridges/date_picker/helper.rb
index cfb90747a..4f9912663 100644
--- a/lib/active_scaffold/bridges/date_picker/helper.rb
+++ b/lib/active_scaffold/bridges/date_picker/helper.rb
@@ -69,7 +69,9 @@ def self.datetime_options(locale)
           ampm: false,
           hourText: I18n.translate!('datetime.prompts.hour', locale: locale),
           minuteText: I18n.translate!('datetime.prompts.minute', locale: locale),
-          secondText: I18n.translate!('datetime.prompts.second', locale: locale)
+          secondText: I18n.translate!('datetime.prompts.second', locale: locale),
+          millisecText: I18n.translate!('datetime.prompts.millisec', locale: locale),
+          microsecText: I18n.translate!('datetime.prompts.microsec', locale: locale)
         }
 
         as_datetime_picker_options = I18n.translate! :datetime_picker_options, scope: :active_scaffold, locale: locale, default: ''